X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ecf30fdea01401011d041ed88795ce8c66c2526..2a4d2d46801ec4771937068f3289a47e04fdaf97:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index bebeca6399..fe8b232036 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -29,42 +29,9 @@
 
     <include file="plugins_deps.bkl"/>
 
-    <!-- ================================================================== -->
-    <!--                     wxWidgets version numbers:                     -->
-    <!-- ================================================================== -->
-
-    <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
-    <set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
-    <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
-    <set var="WX_RELEASE" make_var="1">
-        $(WXVER_MAJOR).$(WXVER_MINOR)
-    </set>
-    <set var="WX_RELEASE_NODOT" make_var="1">
-        $(WXVER_MAJOR)$(WXVER_MINOR)
-    </set>
-    <set var="WX_VERSION" make_var="1">
-        $(WX_RELEASE).$(WXVER_RELEASE)
-    </set>
-    <set var="WX_VERSION_NODOT" make_var="1">
-        $(WX_RELEASE_NODOT)$(WXVER_RELEASE)
-    </set>
 
-    <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
-
-    <!-- this needs to be reset to 0 on beginning of stable series and
-         increment by one 1 every time binary incompatible change is made
-         (i.e. preferably never) -->
-    <set var="WX_BINARY_VERSION">0</set>
-    
-    <set var="WXSOVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">$(WX_BINARY_VERSION).0.0</if>
-        <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
-    </set>
-    <set var="WXMACVERSION">$(WX_VERSION)</set>
-    <set var="WXWIN32DLLVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
-        <if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
-    </set>
+    <!-- wxWidgets version numbers logic: -->
+    <include file="version.bkl"/>
 
 
     <!-- ================================================================== -->
@@ -194,6 +161,8 @@
 
     <set var="DIR_SUFFIX_CPU">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+        <if cond="TARGET_CPU=='AMD64'">_amd64</if>
+        <if cond="TARGET_CPU=='IA64'">_ia64</if>
     </set>
 
     <if cond="FORMAT!='autoconf'">
@@ -216,8 +185,10 @@
     </if>
 
     <set var="LIBTYPE_SUFFIX" make_var="1">
-        <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
-        <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='0' and PLATFORM_WIN32=='1'">lib</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='1' and PLATFORM_WIN32=='1'">dll</if>
+        <if cond="FORMAT=='watcom' and SHARED=='0' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_lib</if>
+        <if cond="FORMAT=='watcom' and SHARED=='1' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_dll</if>
     </set>
 
     <set var="LIBDIRNAME" make_var="1">
@@ -269,13 +240,13 @@
     </set>
 
     <set var="RTTI_DEFINE">
-    	<if cond="USE_RTTI=='0'">wxNO_RTTI</if>
+        <if cond="USE_RTTI=='0'">wxNO_RTTI</if>
     </set>
     <set var="EXCEPTIONS_DEFINE">
-    	<if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
+        <if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
     </set>
     <set var="THREAD_DEFINE">
-    	<if cond="USE_THREADS=='0'">wxNO_THREADS</if>
+        <if cond="USE_THREADS=='0'">wxNO_THREADS</if>
     </set>
 
     <set var="DEBUG_DEFINE">
@@ -290,6 +261,9 @@
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
     </set>
+    <set var="MSLU_DEFINE">
+        <if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>
+    </set>
 
     <!-- fill for the specific case of the format/compiler -->
     <set var="WIN32_WINNT">
@@ -300,6 +274,11 @@
         <if cond="MSLU=='1'">unicows</if>
     </set>
 
+    <set var="LINK_TARGET_CPU">
+        <if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
+        <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
+    </set>
+
     <template id="common_settings">
         <debug-info>$(DEBUGINFO)</debug-info>
         <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
@@ -313,6 +292,16 @@
         </if>
         <define>$(NO_VC_CRTDBG)</define>
         <define>$(WIN32_WINNT)</define>
+        <if cond="FORMAT=='msevc4prj' and
+                  BAKEFILE_VERSION in ['0.1.9'] and
+                  USE_RTTI=='0'">
+            <!-- hack to make eVC4 2.6.2 project files compatible with what we had in 2.6.1 -->
+            <set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
+            <set var="_cppflags">$(_cppflags.replace('/GR', ''))</set>
+        </if>
+        <if cond="FORMAT=='msvc'">
+            <ldflags>$(LINK_TARGET_CPU)</ldflags>
+        </if>
     </template>
 
     <template id="anylib">
@@ -356,33 +345,78 @@
         </if>
     </define-tag>
 
-    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
-        <if cond="FORMAT=='msevc4prj'">
-            <msvc-headers>wx/msw/wince/setup.h</msvc-headers>
-            <set var="vc_setup_h">wince\setup.h</set>
-            <set var="vc_setup_h_rule">wince_setup_h</set>
-        </if>
-        <if cond="FORMAT!='msevc4prj'">
-            <msvc-headers>wx/msw/setup.h</msvc-headers>
-            <set var="vc_setup_h">setup.h</set>
-            <set var="vc_setup_h_rule">setup_h</set>
-        </if>
+    <set var="msvc_copy_setup_h_script">
         <if cond="IS_MSVC_PRJ">
-            <set var="_custom_build_files" append="1">
-                include\wx\msw\$(vc_setup_h)
-            </set>
-            <set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)">
 Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\include\wx\msw\$(vc_setup_h)
+InputPath=..\include\wx\%s
 
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+        </if>
+    </set>
+
+    <define-tag name="msvc-headers-setup-h" rules="dll,lib">
+        <if cond="IS_MSVC_PRJ">
+            <msvc-headers>
+                $(addPrefixToList('wx/', value))
+            </msvc-headers>
+            <set var="_custom_build_files" append="1">
+                $(nativePaths(addPrefixToList('include/wx/', value)))
+            </set>
+        </if>
+    </define-tag>
+
+    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
+        <if cond="IS_MSVC_PRJ">
+            <if cond="FORMAT=='msevc4prj'">
+                <msvc-headers-setup-h>
+                    msw/wince/setup.h
+                </msvc-headers-setup-h>
+                <set var="_custom_build_include_wx_msw_wince_setup_h">
+                    $(msvc_copy_setup_h_script % 'msw\wince\setup.h')
+                </set>
+            </if>
+            <if cond="FORMAT!='msevc4prj'">
+                <msvc-headers-setup-h>
+                    msw/setup.h
+                    univ/setup.h
+                </msvc-headers-setup-h>
+                <set var="_custom_build_include_wx_msw_setup_h">
+                    <if cond="WXUNIV=='0'">
+                        $(msvc_copy_setup_h_script % 'msw\setup.h')
+                    </if>
+                </set>
+                <set var="_custom_build_include_wx_univ_setup_h">
+                    <if cond="WXUNIV=='1'">
+                        $(msvc_copy_setup_h_script % 'univ\setup.h')
+                    </if>
+                </set>
+            </if>
+        </if>
+    </define-tag>
+
+    <define-tag name="msvc-create-rcdefs-h" rules="dll,lib">
+        <if cond="IS_MSVC_PRJ">
+            <msvc-headers-setup-h>
+                msw/genrcdefs.h
+            </msvc-headers-setup-h>
+            <!-- FIXME: we need another way to get the compiler name -->
+            <set var="VC_COMPILER">
+                <if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
+                <if cond="FORMAT!='msevc4prj'">cl</if>
+            </set>
+            <set var="_custom_build_include_wx_msw_genrcdefs_h">
+Creating $(SETUPHDIR)\wx\msw\rcdefs.h
+
+"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw"
+$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>
         </if>
     </define-tag>
 
     <template id="msvc_setup_h">
         <msvc-copy-setup-h/>
+        <msvc-create-rcdefs-h/>
     </template>
 
     <!-- =============================================================== -->
@@ -425,11 +459,10 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <define>$(RTTI_DEFINE)</define>
         <define>$(THREAD_DEFINE)</define>
         <define>$(UNICODE_DEFINE)</define>
-        <!-- this include is added by configure, we need to put other
-             includes before it: -->
+        <define>$(MSLU_DEFINE)</define>
+        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>
-        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <warnings>max</warnings>
         <cppflags-watcom>
             -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
@@ -455,8 +488,15 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
 
         <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
 
+        <!-- system libraries on os2: -->
+        <if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
+            <if cond="FORMAT=='watcom'">
+                <sys-lib>upm32</sys-lib>
+            </if>
+        </if>
+
         <!-- system libraries on windows: -->
-        <if cond="FORMAT!='autoconf'">
+        <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
@@ -548,19 +588,30 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         </if>
     </template>
 
+    <if cond="FORMAT=='autoconf'">
+        <set var="RCDEFDIR">
+            <if cond="TOOLKIT=='MSW'">
+                $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+            </if>
+        </set>
+    </if>
+
     <template id="wx_dll_b" template="wx_lib_b">
         <set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
         <dllname>$(WXDLLNAME)</dllname>
         <version>$(WX_VERSION)</version>
         <so_version>$(WXSOVERSION)</so_version>
-        <mac_version>$(WXMACVERSION)</mac_version>
+
+        <!-- FIXME: until libtool scheme is implemented in bakefile -->
+        <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
 
         <!-- version info resources: -->
         <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
             <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
-            <res-include cond="FORMAT=='autoconf'">
-                $(TOP_SRCDIR)include
-            </res-include>
+            <if cond="FORMAT=='autoconf'">
+                <res-include>$(RCDEFDIR)</res-include>
+                <res-include>$(TOP_SRCDIR)include</res-include>
+            </if>
         </if>
         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
     </template>