X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07910a9a7e775d74d245043d8d991496df72abc5..250e4028f86b5c7b1c31011faef839054c58274e:/build/bakefiles/wx.bkl diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index b4e2509cd9..1855063855 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -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 -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) all ; fi) clean - (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) clean) || true + (if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) clean ; fi) install wxrc - (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) install) || true + (if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) install ; fi) @@ -86,7 +86,7 @@ - build/bakefiles/wxpresets/presets + $(SRCDIR)/build/bakefiles/wxpresets/presets wx.bkl wx_unix.bkl wx_win32.bkl $(DATADIR)/bakefile/presets @@ -101,11 +101,20 @@ - - $(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 @@ -141,7 +150,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) @@ -159,7 +168,7 @@ - + $(LIBDIRNAME) @@ -193,6 +202,33 @@ + + + + + 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) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + + + + + + + @@ -218,7 +254,7 @@ - ALL_BASE_SOURCES WX_VERSION + ALL_PORTS_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION