X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/148e141b23eb2d20722a3d6677f77295bc0254be..5ca59eb82e38957650bb4423030aa446c354cfe3:/build/bakefiles/wx.bkl?ds=inline diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index af7af754cd..f1feafb5ce 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -1,5 +1,4 @@ - @@ -12,38 +11,72 @@ 1 - + - + - + - + $(MSVC6PRJ_MERGED_TARGETS_MULTILIB) $(MSVC6PRJ_MERGED_TARGETS_MONOLIB) - + - + no samples - ../../samples + ../../samples - + + + + + + all + + + monodll + monolib + basedll + baselib + xmldll + xmllib + + + (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) all ; fi) + + + + clean + + (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) clean ; fi) + + + + install + wxrc + + (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) install ; fi) + + + @@ -51,14 +84,11 @@ $(DATADIR)/aclocal - - misc/afm/*.afm - $(DATADIR)/wx/afm - - - misc/gs_afm/*.afm - $(DATADIR)/wx/gs_afm - + + $(SRCDIR)/build/bakefiles/wxpresets/presets + wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py + $(DATADIR)/bakefile/presets + install @@ -66,23 +96,42 @@ $(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) - - $(BUILDDIR) - lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h - $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - + + + $(DYLIB_RPATH_INSTALL) + + + + + 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) - + @@ -95,39 +144,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) @@ -137,26 +176,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 @@ -167,6 +207,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" + + + @@ -187,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 " " @@ -196,12 +262,12 @@ - ALL_BASE_SOURCES WX_VERSION + ALL_PORTS_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION - +