X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58b59bb7d5b7c551b667c4fd0eca9f283cc9cdfe..a1d6c5df6f91f034663953fb5d43daa1b65187f3:/build/bakefiles/wx.bkl?ds=sidebyside diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index 113906f331..11a5aa23fe 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -24,7 +24,7 @@ - + $(MSVC6PRJ_MERGED_TARGETS_MULTILIB) $(MSVC6PRJ_MERGED_TARGETS_MONOLIB) @@ -40,7 +40,7 @@ no samples - ../../samples + ../../samples @@ -61,20 +61,20 @@ xmllib - (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) clean - (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) install wxrc - (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) @@ -87,7 +87,7 @@ $(SRCDIR)/build/bakefiles/wxpresets/presets - wx.bkl wx_unix.bkl wx_win32.bkl + wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DATADIR)/bakefile/presets @@ -97,14 +97,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) ../`basename $(LIBDIR)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + + + $(DYLIB_RPATH_INSTALL) + + + msw/rcdefs.h - + + + $(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx @@ -114,15 +122,17 @@ $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - + - + + $(SRCDIR)/include $(ALL_HEADERS) $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR) - + @@ -141,7 +151,7 @@ it $(LOCALEDIR) - + lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r @@ -150,7 +160,7 @@ all $(MACOS_R) - $(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) $(MACOS_RSRC) $(MACOS_R) @@ -167,8 +177,8 @@ - - + + $(LIBDIRNAME) @@ -184,8 +194,8 @@ univ - $(TOOLKIT_LOWERCASE) - os2 + $(TOOLKIT_LOWERCASE) + os2 @@ -198,12 +208,11 @@ $(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h $(SETUPHDIR)/wx/setup.h - - + libdir_setup_wx @@ -221,7 +230,7 @@ $(SRCDIR)/include/wx/msw/genrcdefs.h - $(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" @@ -245,7 +254,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 " "