X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47bff9ff8b01748a9cb854e014c2e951dc218887..5ca59eb82e38957650bb4423030aa446c354cfe3:/build/bakefiles/wx.bkl?ds=sidebyside diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index c9a033ed49..f1feafb5ce 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -1,5 +1,4 @@ - @@ -24,7 +23,7 @@ - + $(MSVC6PRJ_MERGED_TARGETS_MULTILIB) $(MSVC6PRJ_MERGED_TARGETS_MONOLIB) @@ -40,7 +39,7 @@ no samples - ../../samples + ../../samples @@ -61,20 +60,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 +86,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 +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) + + + $(DYLIB_RPATH_INSTALL) + + + msw/rcdefs.h - + + + $(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx @@ -114,15 +121,17 @@ $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - + - + + $(SRCDIR)/include $(ALL_HEADERS) $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR) - + @@ -141,7 +150,7 @@ it $(LOCALEDIR) - + lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r @@ -150,7 +159,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 +176,8 @@ - - + + $(LIBDIRNAME) @@ -184,8 +193,8 @@ univ - $(TOOLKIT_LOWERCASE) - os2 + $(TOOLKIT_LOWERCASE) + os2 @@ -198,7 +207,6 @@ $(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h $(SETUPHDIR)/wx/setup.h - @@ -212,12 +220,16 @@ + + $(SETUPHDIR)\wx\msw\rcdefs.h + setup_h libdir_setup_wx_msw $(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" @@ -241,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 " "