X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2275c7326890f3322d1f140b5687a75810bc81af..a0d0799beb047cc10e154fbd1c4c635533d318ba:/build/bakefiles/wx.bkl
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 9be3f9895b..07f482ee13 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -24,7 +24,7 @@
-
+
$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)
$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)
@@ -61,20 +61,20 @@
xmllib
- (if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) all ; fi)
+ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) all ; fi)
clean
- (if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) clean ; fi)
+ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) clean ; fi)
install
wxrc
- (if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) install ; fi)
+ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) install ; fi)
@@ -87,7 +87,7 @@
$(SRCDIR)/build/bakefiles/wxpresets/presets
- wx.bkl wx_unix.bkl wx_win32.bkl
+ wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl
$(DATADIR)/bakefile/presets
@@ -104,7 +104,9 @@
msw/rcdefs.h
-
+
+
+
$(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx
@@ -114,15 +116,17 @@
$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
-
+
-
+
+
$(SRCDIR)/include
$(ALL_HEADERS)
$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-
+
@@ -141,7 +145,7 @@
it
$(LOCALEDIR)
-
+
lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r
@@ -167,8 +171,8 @@
-
-
+
+
$(LIBDIRNAME)
@@ -198,7 +202,6 @@
$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h
$(SETUPHDIR)/wx/setup.h
-