X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a92d711e45a181654d2d3bcf6a344b5a6299d9b9..27a17b74f8b774b8fa9396601462492b29859875:/build/bakefiles/wx.bkl
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 56866d9f74..8b8b4cdcb6 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -42,8 +42,31 @@
samples
../../samples
-
-
+
+
+
+
+
+
+ all
+
+ (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) all) || true
+
+
+
+ clean
+
+ (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) clean) || true
+
+
+
+ install
+
+ (test -d utils/wxrc && cd utils/wxrc && $(DOLLAR)(MAKE) install) || true
+
+
+
@@ -53,11 +76,11 @@
misc/afm/*.afm
- $(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/afm
+ $(DATADIR)/wx/afm
misc/gs_afm/*.afm
- $(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/gs_afm
+ $(DATADIR)/wx/gs_afm
@@ -65,25 +88,22 @@
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
- $(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(LIBDIR)/wx/config
- (cd $(DESTDIR)$(LIBDIR)/wx/config && rm -f $(TOOLCHAIN_NAME) && $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
- $(INSTALL_PROGRAM) wx-config-$(WXVER_MAJOR).$(WXVER_MINOR) $(DESTDIR)$(BINDIR)
- (cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) wx-config-$(WXVER_MAJOR).$(WXVER_MINOR) wx-config)
- (cd $(DESTDIR)$(BINDIR) && rm -f wx$(TOOLCHAIN_NAME)-config && $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-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)
$(BUILDDIR)
- lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h
- $(LIBDIR)/wx/include/$(TOOLCHAIN_NAME)/wx
+ lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h
+ $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
$(SRCDIR)/include
$(ALL_HEADERS)
- $(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)
+ $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)