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

Honour COMPILER_PREFIX in wx presets too.

Browse Source 
If a non-default COMPILER_PREFIX was specified when building wxWidgets, we
should also be able to use the same prefix when building applications using
this build, so use COMPILER_PREFIX instead of just COMPILER in the project/
makefiles generated using wx presets.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-07 10:50:45 +00:00
parent c315587c21
commit 226ac45fc3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,7 +385,7 @@
</define-tag> </define-tag>
<!-- Sets as output folder for the current target a directory <!-- Sets as output folder for the current target a directory
called "$(value)/$(COMPILER)_lib|dll", just like wxWidgets does. called "$(value)/$(COMPILER_PREFIX)_lib|dll", just like wxWidgets does.
This makes it possible to keep separed the libraries/exes compiled with This makes it possible to keep separed the libraries/exes compiled with
different compilers and with a different value for WX_SHARED. different compilers and with a different value for WX_SHARED.
--> -->
@@ -396,7 +396,7 @@
<if cond="WX_SHARED=='1'">dll</if> <if cond="WX_SHARED=='1'">dll</if>
</set> </set>
<set var="_DIRNAME"> <set var="_DIRNAME">
$(value)/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX) $(value)/$(COMPILER_PREFIX)_$(_DIRNAME_SHARED_SUFFIX)
</set> </set>
<dirname>$(_DIRNAME)</dirname> <dirname>$(_DIRNAME)</dirname>
@@ -479,7 +479,7 @@
</set> </set>
<set var="BUILDDIR"> <set var="BUILDDIR">
$(COMPILER)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX) $(COMPILER_PREFIX)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
</set> </set>
</if> </if>
</define-global-tag> </define-global-tag>

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

@@ -66,8 +66,8 @@
</set> </set>
<set var="WXLIBPATH"> <set var="WXLIBPATH">
<if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_lib</if> <if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_lib</if>
<if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_dll</if> <if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_dll</if>
</set> </set>
<!-- under Unix this is an option (detected at configure-time); <!-- under Unix this is an option (detected at configure-time);