X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/712593b0030f14ce39b29f47217a864cbf016ca0..a0d0799beb047cc10e154fbd1c4c635533d318ba:/build/bakefiles/wx.bkl?ds=sidebyside diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index 2a1555f72f..07f482ee13 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -24,7 +24,7 @@ - + $(MSVC6PRJ_MERGED_TARGETS_MULTILIB) $(MSVC6PRJ_MERGED_TARGETS_MONOLIB) @@ -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 $(DATADIR)/bakefile/presets @@ -97,23 +97,36 @@ $(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) - - $(BUILDDIR) - lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h - $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - + + msw/rcdefs.h + - + + + + $(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx + + + setup.h $(RCDEFS_H) + + + $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx + + + + + $(SRCDIR)/include $(ALL_HEADERS) $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR) - + @@ -132,7 +145,7 @@ it $(LOCALEDIR) - + lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r @@ -141,7 +154,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) @@ -158,8 +171,8 @@ - - + + $(LIBDIRNAME) @@ -189,6 +202,32 @@ $(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h $(SETUPHDIR)/wx/setup.h + + + + + + + + libdir_setup_wx + $(SETUPHDIR)/wx/msw + + + + + + $(SETUPHDIR)\wx\msw\rcdefs.h + + setup_h + libdir_setup_wx_msw + $(SRCDIR)/include/wx/msw/genrcdefs.h + + + $(DOLLAR)(CPP) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + + + @@ -218,7 +257,7 @@ - ALL_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION + ALL_PORTS_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION