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

added COMPILER_PREFIX support to wxpresets

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2009-10-19 13:57:25 +00:00
parent 0df5d67316
commit 84cd6e0c68
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/wx.bkl
View File

@@ -87,7 +87,7 @@
<data-files> <data-files>
<srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir> <srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>
<files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl</files> <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py</files>
<install-to>$(DATADIR)/bakefile/presets</install-to> <install-to>$(DATADIR)/bakefile/presets</install-to>
</data-files> </data-files>

4
build/bakefiles/wxpresets/presets/wx.bkl
View File

@@ -112,6 +112,7 @@
<requires version="0.2.2"/> <requires version="0.2.2"/>
<using module="wx_presets"/>
<!-- this variable identifies the version of the wx presets. <!-- this variable identifies the version of the wx presets.
this is changed only when major changes to wxpresets take place. this is changed only when major changes to wxpresets take place.
@@ -272,8 +273,7 @@
<if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if> <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
</set> </set>
<!-- FIXME: how to make it a make var? --> <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
<set var="COMPILER_PREFIX">$(COMPILER)</set>

11
build/bakefiles/wxpresets/presets/wx_presets.py Normal file
View File

@@ -0,0 +1,11 @@
# We use 'COMPILER_PREFIX' option in places where bakefile doesn't like it, so
# we must register a substitution function for it that provides additional
# knowledge about the option (in this case that it does not contain dir
# separators and so utils.nativePaths() doesn't have to do anything with it):
from utils import addSubstituteCallback
def __noopSubst(name, func, caller):
return '$(%s)' % name
addSubstituteCallback('COMPILER_PREFIX', __noopSubst)