X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6978d5b4de565b2fa164cdd4dd06d6021485894..991023b4739aafaf210dd5464973ed5c31a3de6d:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 2d35ed97f6..a854f30dc1 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -33,6 +33,10 @@
         <if cond="USE_GUI=='0'">base</if>
         <if cond="USE_GUI=='1'">$(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)</if>
     </set>
+    
+    <set var="WXBASEPORT">
+        <if cond="TOOLKIT=='MAC'">_carbon</if>
+    </set>
 
     <set var="COMPILERORGCC">
         <if cond="isdefined('COMPILER')">$(COMPILER)</if>
@@ -65,17 +69,22 @@
     </set>
 
     <if cond="FORMAT=='autoconf'">
-        <set var="WXNAMEPREFIX">wx_base</set>
+        <set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>
         <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
         <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
     </if>
     <if cond="FORMAT!='autoconf'">
-        <set var="WXNAMEPREFIX">wxbase$(WXVER_MAJOR)$(WXVER_MINOR)</set>
-        <set var="WXNAMEPREFIXGUI">wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
+        <set var="WXNAMEPREFIX">
+            wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
+        </set>
+        <set var="WXNAMEPREFIXGUI">
+            wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
         <set var="WXVERSIONTAG"></set>
     </if>
     <set var="WXDLLNAMEPREFIX">
-        <if cond="PLATFORM_WIN32=='1'">wxbase$(WXVER_MAJOR)$(WXVER_MINOR)</if>
+        <if cond="PLATFORM_WIN32=='1'">
+            wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
+        </if>
         <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
     </set>
     <set var="WXDLLNAMEPREFIXGUI">
@@ -156,27 +165,24 @@
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
     </set>
-    
-    <template id="anylib">
-        <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
-        <dirname>$(LIBDIRNAME)</dirname>
-        <install-to>$(LIBDIR)</install-to>
-        
+
+    <template id="common_settings">
         <debug-info>$(DEBUGFLAG)</debug-info>
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>multi</threading>
         <runtime-libs>dynamic</runtime-libs>
-
         <if cond="FORMAT!='autoconf'">
-            <define>WINVER=0x0400</define>
-            <define>_WIN32_IE=0x0400</define>
-            <define>STRICT</define>
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>
-
+    </template>
+    
+    <template id="anylib">
+        <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
+        <dirname>$(LIBDIRNAME)</dirname>
+        <install-to>$(LIBDIR)</install-to>
     </template>
 
-    <template id="3rdparty_lib" template="anylib">
+    <template id="3rdparty_lib" template="common_settings,anylib">
         <libname>$(id)$(WXDEBUGFLAG)</libname>
     </template>
 
@@ -198,7 +204,7 @@
     <!--                  Templates for wxWindows libs:                  -->
     <!-- =============================================================== -->
 
-    <template id="wx">
+    <template id="wx" template="common_settings">
         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>
@@ -240,7 +246,6 @@
                 <sys-lib>winspool</sys-lib>
                 <sys-lib>winmm</sys-lib>
                 <sys-lib>shell32</sys-lib>
-                <sys-lib>oldnames</sys-lib>
                 <sys-lib>comctl32</sys-lib>
                 <sys-lib>odbc32</sys-lib>
                 <sys-lib>ole32</sys-lib>