Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct the include order for the resource compiler

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-11-08 23:17:24 +00:00
parent c8d5853155
commit 92641c0dc0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/common.bkl
View File

@@ -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>

2
build/bakefiles/common_samples.bkl
View File

@@ -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>