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

make it posible to change the compiler part of objects directory by setting COMPILER_PREFIX make variable

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-05-15 12:48:26 +00:00
parent c4f6f41c84
commit dad909f709
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/bakefiles/common.bkl
View File

@ -183,8 +183,13 @@
<set var="CFG_NAME_PART">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
<!-- NB: this is make_var so that it can be overriden on command line
like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
<set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
<set var="OBJS" make_var="1">
$(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
$(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
</set>
<set var="BUILDDIR">$(OBJS)</set>
@ -200,7 +205,7 @@
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
<if cond="FORMAT!='autoconf'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
</if>
</set>

12
docs/msw/install.txt
View File

@ -778,6 +778,10 @@ DEBUG_INFO=1
Same as DEBUG_FLAG in behaviour, this option affects whether debugging
information is included in the executable or not.
TARGET_CPU=AMD64|IA64
(VC++ only.) Set this variable to build for x86_64 systems. If unset, x86
build is performed.
VENDOR=<your company name>
Set this to a short string identifying your company if you are planning to
distribute wxWidgets DLLs with your application. Default value is 'custom'.
@ -792,6 +796,14 @@ CFG=<configuration name>
different setup.h settings coexisting in same tree. See "Object and library
directories" below for more information.
COMPILER_PREFIX=<string>
If you build with multiple versions of the same compiler, you can put
their outputs into directories like "vc6_lib", "vc8_lib" etc. instead of
"vc_lib" by setting this variable to e.g. "vc6". This is merely a
convenience variable, you can achieve the same effect (but different dir
names) with the CFG option.
Compiler specific options
----------------------------------------------------------------