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

No real changes, just rename DIR_SUFFIX_CPU to ARCH_SUFFIX in bakefiles.

Browse Source 
This will be soon used in the libraries names and not only in the directory
paths so rename the variable to make things more clear (or at least less
confusing).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-01 21:35:18 +00:00
parent 75aaa4c5ac
commit df1547b7bc
6 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/bakefiles/common.bkl
View File

@@ -30,7 +30,6 @@
<!-- wxWidgets version numbers logic: --> <!-- wxWidgets version numbers logic: -->
<include file="version.bkl"/> <include file="version.bkl"/>
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- Names of libraries and DLLs: --> <!-- Names of libraries and DLLs: -->
<!-- ================================================================== --> <!-- ================================================================== -->
@@ -169,7 +168,7 @@
<!-- Where to store built libraries and objects: --> <!-- Where to store built libraries and objects: -->
<!-- =============================================================== --> <!-- =============================================================== -->
<set var="DIR_SUFFIX_CPU"> <set var="ARCH_SUFFIX">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if> <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
<if cond="TARGET_CPU=='amd64'">_amd64</if> <if cond="TARGET_CPU=='amd64'">_amd64</if>
<if cond="TARGET_CPU=='AMD64'">_amd64</if> <if cond="TARGET_CPU=='AMD64'">_amd64</if>
@@ -190,7 +189,7 @@
<set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set> <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
<set var="OBJS" make_var="1"> <set var="OBJS" make_var="1">
$(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
</set> </set>
<set var="BUILDDIR">$(OBJS)</set> <set var="BUILDDIR">$(OBJS)</set>
@@ -206,7 +205,7 @@
<set var="LIBDIRNAME" make_var="1"> <set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if> <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
<if cond="FORMAT!='autoconf'"> <if cond="FORMAT!='autoconf'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
</if> </if>
</set> </set>

12
build/msw/makefile.vc
View File

@@ -32,9 +32,9 @@ WX_RELEASE_NODOT = 29
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
LIBDIRNAME = \ LIBDIRNAME = \
..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) ..\..\lib\$(COMPILER_PREFIX)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
@@ -1747,16 +1747,16 @@ WXUNICODEFLAG = u
WXUNIVNAME = univ WXUNIVNAME = univ
!endif !endif
!if "$(TARGET_CPU)" == "AMD64" !if "$(TARGET_CPU)" == "AMD64"
DIR_SUFFIX_CPU = _amd64 ARCH_SUFFIX = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "IA64" !if "$(TARGET_CPU)" == "IA64"
DIR_SUFFIX_CPU = _ia64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
DIR_SUFFIX_CPU = _amd64 ARCH_SUFFIX = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
DIR_SUFFIX_CPU = _ia64 ARCH_SUFFIX = _ia64
!endif !endif
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
WXDLLFLAG = dll WXDLLFLAG = dll

8
build/msw/wx_core.dsp
View File

@@ -5240,10 +5240,10 @@ SOURCE=..\..\include\wx\msw\iniconf.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\init.h SOURCE=..\..\include\wx\msw\init.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\joystick.h SOURCE=..\..\include\wx\msw\joystick.h
# End Source File # End Source File
# Begin Source File # Begin Source File

6
build/msw/wx_vc7_core.vcproj
View File

@@ -4502,9 +4502,9 @@
RelativePath="..\..\include\wx\msw\iniconf.h"> RelativePath="..\..\include\wx\msw\iniconf.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\init.h"> RelativePath="..\..\include\wx\msw\init.h">
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\joystick.h"> RelativePath="..\..\include\wx\msw\joystick.h">
</File> </File>
<File <File

8
build/msw/wx_vc8_core.vcproj
View File

@@ -6024,10 +6024,10 @@
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\init.h" RelativePath="..\..\include\wx\msw\init.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\joystick.h" RelativePath="..\..\include\wx\msw\joystick.h"
> >
</File> </File>

8
build/msw/wx_vc9_core.vcproj
View File

@@ -6020,10 +6020,10 @@
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\init.h" RelativePath="..\..\include\wx\msw\init.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\wx\msw\joystick.h" RelativePath="..\..\include\wx\msw\joystick.h"
> >
</File> </File>