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

require bakefile-0.2.1; remove workarounds for older versions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-11-19 13:24:05 +00:00
parent 2887cdbded
commit 79a2ea3463
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
build/bakefiles/common.bkl
View File

@@ -3,7 +3,7 @@
<makefile> <makefile>
<requires version="0.1.7"/> <requires version="0.2.1"/>
<!-- bakefile modules we need: --> <!-- bakefile modules we need: -->
<using module="datafiles"/> <using module="datafiles"/>
@@ -351,17 +351,9 @@
<define-tag name="msvc-headers" rules="dll,lib"> <define-tag name="msvc-headers" rules="dll,lib">
<if cond="IS_MSVC_PRJ"> <if cond="IS_MSVC_PRJ">
<!-- FIXME: remove this once we require >=bkl-0.1.9 --> <msvc-project-files>
<if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']"> $(addPrefixToList('include\\', wxwin.headersOnly(value)))
<msvc-project-files> </msvc-project-files>
$(addPrefixToList('include\', wxwin.headersOnly(value)))
</msvc-project-files>
</if>
<if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
<msvc-project-files>
$(addPrefixToList('include\\', wxwin.headersOnly(value)))
</msvc-project-files>
</if>
</if> </if>
</define-tag> </define-tag>
@@ -646,12 +638,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags> <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
<!-- version info resources: --> <!-- version info resources: -->
<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>
<res-define>WXDLLNAME=$(WXDLLNAME)</res-define> <if cond="FORMAT=='autoconf'">
<if cond="FORMAT=='autoconf'"> <res-include>$(RCDEFDIR)</res-include>
<res-include>$(RCDEFDIR)</res-include> <res-include>$(TOP_SRCDIR)include</res-include>
<res-include>$(TOP_SRCDIR)include</res-include>
</if>
</if> </if>
<win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res> <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
</template> </template>