Honour COMPILER_PREFIX in wx presets too.
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:
parent
c315587c21
commit
226ac45fc3
2 changed files with 5 additions and 5 deletions
|
|
@ -66,8 +66,8 @@
|
|||
</set>
|
||||
|
||||
<set var="WXLIBPATH">
|
||||
<if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_lib</if>
|
||||
<if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_dll</if>
|
||||
<if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_lib</if>
|
||||
<if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_dll</if>
|
||||
</set>
|
||||
|
||||
<!-- under Unix this is an option (detected at configure-time);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue