X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47bff9ff8b01748a9cb854e014c2e951dc218887..fe6b1b853aaa900356d12f69e8e3d84467221f4c:/build/bakefiles/wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index c9a033ed49..58e38626de 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -24,7 +24,7 @@
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
 
-    <if cond="FORMAT in ['msvc6prj','msevc4prj']">
+    <if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj']">
         <set var="MSVC6PRJ_MERGED_TARGETS">
             <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
             <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
@@ -61,20 +61,20 @@
             <depends>xmllib</depends>
 
             <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
+                (if test -f utils/wxrc/Makefile ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all ; fi)
             </command>
         </action>
         <action id="clean-wxrc" cond="USE_XRC=='1'">
             <dependency-of>clean</dependency-of>
             <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean) || true
+                (if test -f utils/wxrc/Makefile ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean ; fi)
             </command>
         </action>
         <action id="install-wxrc" cond="USE_XRC=='1'">
             <dependency-of>install</dependency-of>
             <depends>wxrc</depends>
             <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
+                (if test -f utils/wxrc/Makefile ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install ; fi)
             </command>
         </action>
 
@@ -97,14 +97,16 @@
                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
                 $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
             </command>
         </action>
 
         <set var="RCDEFS_H">
             <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
         </set>
-        <headers>
+
+
+        <data-files-tree>
             <srcdir>
                 $(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx
             </srcdir>
@@ -114,15 +116,19 @@
             <install-to>
                 $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
             </install-to>
-        </headers>
+        </data-files-tree>
 
-        <headers>
+        <!-- FIXME: make this use <headers> once it supports prefix removal -->
+        <if cond="BAKEFILE_VERSION!='0.2.3'">
+            <warning>is it time to use per-target &lt;headers&gt; now?</warning>
+        </if>
+        <data-files-tree>
             <srcdir>$(SRCDIR)/include</srcdir>
             <files>$(ALL_HEADERS)</files>
             <install-to>
                 $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
             </install-to>
-        </headers>
+        </data-files-tree>
 
         <!-- Locales: -->
         <using module="gettext"/>
@@ -150,7 +156,7 @@
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
             <command>
-                $(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)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
@@ -203,7 +209,7 @@
 
 
     <!-- create rcdefs.h on Windows: -->
-    <if cond="FORMAT in ['borland','mingw','msvc','watcom']">
+    <if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">
 
         <mkdir id="libdir_setup_wx_msw">
             <depends>libdir_setup_wx</depends>
@@ -212,12 +218,16 @@
 
         <action id="rcdefs.h">
 
+            <!-- Can't seem to set id to a name with a dollar sign
+                 so use __targetname as a temporary work around -->
+            <set var="__targetname">$(SETUPHDIR)\wx\msw\rcdefs.h</set>
+
             <dependency-of>setup_h</dependency-of>
             <depends>libdir_setup_wx_msw</depends>
             <depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
 
             <command>
-                $(DOLLAR)(CPP) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
+                $(DOLLAR)(CPP) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </command>
 
         </action>