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

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 756148cbe9bc23d71afc3745dd8d4d73b50f1a14..16beffe62172281726fc9460e9b443594fe38ed0 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -30,7 +30,6 @@
     <!-- wxWidgets version numbers logic: -->
     <include file="version.bkl"/>
 
-
     <!-- ================================================================== -->
     <!--                     Names of libraries and DLLs:                   -->
     <!-- ================================================================== -->
@@ -169,7 +168,7 @@
     <!--             Where to store built libraries and objects:         -->
     <!-- =============================================================== -->
 
-    <set var="DIR_SUFFIX_CPU">
+    <set var="ARCH_SUFFIX">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</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="OBJS" make_var="1">
-            $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
+            $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>
@@ -206,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_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
         </if>
     </set>
 

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index ea371852c7f7e9d9210a4745565c4cb764d9437b..7cd0c7a244823f593b56f807f1c8e8bc914471c9 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -5240,10 +5240,10 @@ SOURCE=..\..\include\wx\msw\iniconf.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\init.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\msw\init.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\joystick.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index f77793111e6ab8da2267ef417e669fddd36dc609..6a2a2a04a77305c9c4c30b4151234244acb79bfa 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -4502,9 +4502,9 @@
                                RelativePath="..\..\include\wx\msw\iniconf.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\init.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\init.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\msw\joystick.h">\r
                        </File>\r
                        <File\r

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 3ff06c8b01814e7237c89cef0f2b4d84f813c96c..79923e2ed3d7a58d63825fd95d633be4e787d8f6 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -6024,10 +6024,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\init.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\init.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\msw\joystick.h"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index eae3a09ac44f105bdf5b722a95589ae078ad474d..9a54b88268ca119bd16eeb847cded9bc9ebe3cbd 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -6020,10 +6020,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\init.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\init.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\msw\joystick.h"\r
                                >\r
                        </File>\r