X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e762ef8f531bd3c48761b39e4b6c96f9a7443020..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 2ada7a726e..db792b410b 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -30,6 +30,15 @@
     <!-- wxWidgets version numbers logic: -->
     <include file="version.bkl"/>
 
+    <set var="ARCH_SUFFIX">
+        <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+        <if cond="TARGET_CPU=='amd64'">_x64</if>
+        <if cond="TARGET_CPU=='AMD64'">_x64</if>
+        <if cond="TARGET_CPU=='ia64'">_ia64</if>
+        <if cond="TARGET_CPU=='IA64'">_ia64</if>
+        <if cond="TARGET_CPU=='x64'">_x64</if>
+        <if cond="TARGET_CPU=='X64'">_x64</if>
+    </set>
 
     <!-- ================================================================== -->
     <!--                     Names of libraries and DLLs:                   -->
@@ -44,12 +53,26 @@
         <if cond="TOOLKIT=='MAC'">_carbon</if>
     </set>
 
+    <!--
+        Optional compiler version, mainly for Windows compilers for which it is
+        supposed to be set on make command line for the official builds.
+     -->
+    <set var="COMPILER_VERSION" make_var="1">
+        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD</if>
+    </set>
+
     <set var="COMPILERORGCC">
         <if cond="isdefined('COMPILER')">$(COMPILER)</if>
         <if cond="not isdefined('COMPILER')">gcc</if>
     </set>
+
+    <!--
+        In the official builds we use not only the compiler name but also its
+        version and architecture we compile for in the libraries names.
+     -->
     <set var="WXCOMPILER">
-        <if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
+        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">_$(COMPILERORGCC)$(COMPILER_VERSION)$(ARCH_SUFFIX)</if>
+        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(COMPILERORGCC)</if>
     </set>
 
     <set var="VENDORTAG">
@@ -169,14 +192,6 @@
     <!--             Where to store built libraries and objects:         -->
     <!-- =============================================================== -->
 
-    <set var="DIR_SUFFIX_CPU">
-        <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
-        <if cond="TARGET_CPU=='amd64'">_amd64</if>
-        <if cond="TARGET_CPU=='AMD64'">_amd64</if>
-        <if cond="TARGET_CPU=='ia64'">_ia64</if>
-        <if cond="TARGET_CPU=='IA64'">_ia64</if>
-    </set>
-
     <if cond="FORMAT!='autoconf'">
         <set var="WXDLLFLAG">
             <if cond="SHARED=='1'">dll</if>
@@ -190,7 +205,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)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>
@@ -206,7 +221,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)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
         </if>
     </set>
 
@@ -305,6 +320,8 @@
         <if cond="TARGET_CPU=='AMD64'">/MACHINE:X64</if>
         <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
         <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
+        <if cond="TARGET_CPU=='x64'">/MACHINE:X64</if>
+        <if cond="TARGET_CPU=='X64'">/MACHINE:X64</if>
     </set>
 
     <template id="common_settings">
@@ -424,7 +441,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                     univ/setup.h
                 </msvc-headers-setup-h>
                 <set var="_custom_build_include_wx_msw_setup_h">
-                    <if cond="WXUNIV=='0'">
+                    <if cond="WXUNIV=='0' and TOOLKIT=='MSW'">
                         $(msvc_copy_setup_h_script % 'msw\setup.h')
                     </if>
                 </set>
@@ -614,7 +631,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <define>WXBUILDING</define>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','PM','WINCE']">
+            <if cond="FORMAT!='autoconf'">
                 <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
                 <precomp-headers-gen>
                     $(WXTOPDIR)src/common/dummy.cpp