From 84cd6e0c687440eff1c8a9b952dd724194899a46 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 19 Oct 2009 13:57:25 +0000 Subject: [PATCH] added COMPILER_PREFIX support to wxpresets git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/wx.bkl | 2 +- build/bakefiles/wxpresets/presets/wx.bkl | 4 ++-- build/bakefiles/wxpresets/presets/wx_presets.py | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 build/bakefiles/wxpresets/presets/wx_presets.py diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index 1265e4dc77..6d6995515a 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -87,7 +87,7 @@ $(SRCDIR)/build/bakefiles/wxpresets/presets - wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl + wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DATADIR)/bakefile/presets diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl index eae18ed220..ff06b7f6fd 100644 --- a/build/bakefiles/wxpresets/presets/wx.bkl +++ b/build/bakefiles/wxpresets/presets/wx.bkl @@ -112,6 +112,7 @@ + - $(COMPILER) + $(COMPILER) diff --git a/build/bakefiles/wxpresets/presets/wx_presets.py b/build/bakefiles/wxpresets/presets/wx_presets.py new file mode 100644 index 0000000000..60af474f6c --- /dev/null +++ b/build/bakefiles/wxpresets/presets/wx_presets.py @@ -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) -- 2.50.0