X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b3dba492726e80855b2f348433338e6561c7bfb..daebb44c74bdbdc8ce43bd4aa471774d92f35f02:/build/bakefiles/wx.bkl diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index f891ad73f5..2eb036a770 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -12,13 +12,13 @@ 1 - + - + - + @@ -30,21 +30,21 @@ $(MSVC6PRJ_MERGED_TARGETS_MONOLIB) - + - + no samples - ../../samples + ../../samples - + - + @@ -59,7 +59,7 @@ baselib xmldll xmllib - + (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) all) || true @@ -77,7 +77,7 @@ (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) install) || true - + @@ -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 @@ -120,39 +135,29 @@ $(LOCALEDIR) + + $(SRCDIR)/locale/msw + wxmsw + it + $(LOCALEDIR) + + lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc - - all - $(MACOS_R) - - $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/carbon/apprsrc.r $(top_srcdir)/src/mac/carbon/carbrsrc.r $(top_srcdir)/src/mac/carbon/corersrc.r -o $(MACOS_RSRC) - $(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R) - - $(MACOS_RSRC) $(MACOS_R) - - - install - macos-res - - $(INSTALL_DATA) $(MACOS_R) $(LIBDIR) - $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR) - - 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) install - macos-res + cocoa-res $(INSTALL_DATA) $(MACOS_R) $(LIBDIR) $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR) @@ -162,26 +167,27 @@ - - + + $(LIBDIRNAME) libdir - $(SETUPHDIR) + $(SETUPHDIR) libdir_setup setup_h - $(SETUPHDIR)/wx + $(SETUPHDIR)/wx univ - $(TOOLKIT_LOWERCASE) + $(TOOLKIT_LOWERCASE) + os2 - + $(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h $(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h @@ -196,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" + + + + + + + @@ -221,12 +254,12 @@ - ALL_BASE_SOURCES WX_VERSION + ALL_PORTS_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION - +