Correct the include order for the resource compiler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 0222f6dee184596a70cdd50566fc4298fdcea797..fe8b2320360f36e254ebcf9004261958592bce16 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -400,6 +400,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <msvc-headers-setup-h>
                 msw/genrcdefs.h
             </msvc-headers-setup-h>
+            <!-- FIXME: we need another way to get the compiler name -->
             <set var="VC_COMPILER">
                 <if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
                 <if cond="FORMAT!='msevc4prj'">cl</if>
@@ -608,8 +609,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
             <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
             <if cond="FORMAT=='autoconf'">
-                <res-include>$(TOP_SRCDIR)include</res-include>
                 <res-include>$(RCDEFDIR)</res-include>
+                <res-include>$(TOP_SRCDIR)include</res-include>
             </if>
         </if>
         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index a211e9dcf6c736e9daf3ec74685ec8d2b66bb111..0633b53fe4af6fbf91e9af3183d4022933694d24 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -35,8 +35,8 @@
         <!-- this include is not added via <include> for autoconf, see
              common.bkl: -->
         <if cond="FORMAT=='autoconf'">
-            <res-include>$(TOP_SRCDIR)include</res-include>
             <res-include>$(RCDEFDIR)</res-include>
+            <res-include>$(TOP_SRCDIR)include</res-include>
         </if>
         
         <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>