X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d931bcca003e3616204c1eebc218ec6cd5b7029..559a723c1dcf8b3929ab3122fb04429d4abdda8e:/build/bakefiles/wx.bkl diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index a8b8128d92..2eb036a770 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -40,7 +40,7 @@ no samples - ../../samples + ../../samples @@ -85,6 +85,12 @@ $(DATADIR)/aclocal + + $(SRCDIR)/build/bakefiles/wxpresets/presets + wx.bkl wx_unix.bkl wx_win32.bkl + $(DATADIR)/bakefile/presets + + install @@ -95,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 @@ -135,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) @@ -153,7 +168,7 @@ - + $(LIBDIRNAME) @@ -187,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" + + + + + + + @@ -212,7 +254,7 @@ - ALL_BASE_SOURCES WX_VERSION + ALL_PORTS_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION