X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58b59bb7d5b7c551b667c4fd0eca9f283cc9cdfe..787de8404830402133e7635e47b9c14d3b7ad892:/build/bakefiles/wx.bkl diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index 113906f331..f1feafb5ce 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -1,5 +1,4 @@ <?xml version="1.0" ?> -<!-- $Id$ --> <!-- Master bakefile for wxWidgets --> @@ -24,7 +23,7 @@ <!-- ...and when there are multiple libraries: --> <include file="multilib.bkl"/> - <if cond="FORMAT in ['msvc6prj','msevc4prj']"> + <if cond="IS_MSVC_PRJ"> <set var="MSVC6PRJ_MERGED_TARGETS"> <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if> <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if> @@ -40,7 +39,7 @@ <subproject id="samples"> <installable>no</installable> <dir cond="FORMAT=='autoconf'">samples</dir> - <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir> + <dir cond="FORMAT!='autoconf'">../../samples</dir> </subproject> <if cond="FORMAT=='autoconf'"> @@ -61,20 +60,20 @@ <depends>xmllib</depends> <command> - (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) all) || true + (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) all ; fi) </command> </action> <action id="clean-wxrc" cond="USE_XRC=='1'"> <dependency-of>clean</dependency-of> <command> - (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) clean) || true + (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) clean ; fi) </command> </action> <action id="install-wxrc" cond="USE_XRC=='1'"> <dependency-of>install</dependency-of> <depends>wxrc</depends> <command> - (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) install) || true + (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) install ; fi) </command> </action> @@ -87,7 +86,7 @@ <data-files> <srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir> - <files>wx.bkl wx_unix.bkl wx_win32.bkl</files> + <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py</files> <install-to>$(DATADIR)/bakefile/presets</install-to> </data-files> @@ -97,14 +96,22 @@ $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config - (cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + (cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) </command> </action> + <modify-target target="install"> + <command> + $(DYLIB_RPATH_INSTALL) + </command> + </modify-target> + <set var="RCDEFS_H"> <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if> </set> - <headers> + + + <data-files-tree> <srcdir> $(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx </srcdir> @@ -114,15 +121,17 @@ <install-to> $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx </install-to> - </headers> + </data-files-tree> - <headers> + <!-- FIXME: make this use per-target <headers> once it supports + prefix removal --> + <data-files-tree> <srcdir>$(SRCDIR)/include</srcdir> <files>$(ALL_HEADERS)</files> <install-to> $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR) </install-to> - </headers> + </data-files-tree> <!-- Locales: --> <using module="gettext"/> @@ -141,7 +150,7 @@ <linguas>it</linguas> <install-to>$(LOCALEDIR)</install-to> </gettext-catalogs> - + <!-- Mac OS X resources: --> <set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set> @@ -150,7 +159,7 @@ <dependency-of>all</dependency-of> <set var="__targetname">$(MACOS_R)</set> <command> - $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC) + $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC) $(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R) </command> <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files> @@ -167,8 +176,8 @@ </if> - <!-- copy setup.h on DOS/OS2/Windows: --> - <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']"> + <!-- copy setup.h on DOS/OS2/Windows if the format supports it: --> + <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0'"> <mkdir id="libdir"> <dir>$(LIBDIRNAME)</dir> </mkdir> @@ -184,8 +193,8 @@ <set var="SETUP_H_SUBDIR"> <if cond="WXUNIV=='1'">univ</if> - <if cond="WXUNIV=='0' and TOOLKIT!='PM'">$(TOOLKIT_LOWERCASE)</if> - <if cond="WXUNIV=='0' and TOOLKIT=='PM'">os2</if> + <if cond="WXUNIV=='0' and PLATFORM_OS2!='1'">$(TOOLKIT_LOWERCASE)</if> + <if cond="WXUNIV=='0' and PLATFORM_OS2=='1'">os2</if> </set> <copy-file-to-file-if-not-exist id="master_setup.h"> @@ -198,12 +207,11 @@ <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src> <dst>$(SETUPHDIR)/wx/setup.h</dst> </copy-file-to-file-if-not-exist> - </if> <!-- create rcdefs.h on Windows: --> - <if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'"> + <if cond="FORMAT in ['borland','mingw','msvc','watcom']"> <mkdir id="libdir_setup_wx_msw"> <depends>libdir_setup_wx</depends> @@ -221,7 +229,7 @@ <depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file> <command> - $(DOLLAR)(CPP) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + $(DOLLAR)(CPP) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" </command> </action> @@ -245,7 +253,7 @@ @echo " wxWidgets comes with no guarantees and doesn't claim" @echo " to be suitable for any purpose." @echo " " -@echo " Read the wxWidgets Licence on licencing conditions." +@echo " Read the wxWindows Licence on licencing conditions." @echo " " @echo " ------------------------------------------------------" @echo " "