X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb8bbc13259cad5d7604985a23213b6c00c19fd8..a3aa294d4c14572febcd937b725a7cca4b8720cf:/build/bakefiles/common.bkl?ds=sidebyside

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 864e8f49e3..9f64e18797 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</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">wx$(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'">wx$(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">
@@ -89,10 +98,6 @@
         <if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
     </set>
 
-    <set var="TOOLCHAIN_NAME">
-        $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
-    </set>
-
     
     <!-- =============================================================== -->
     <!--                    Names of component libraries:                -->
@@ -125,7 +130,7 @@
         <set var="CFG_NAME_PART">
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>
-        <set var="OBJS" make_var="1">objs_$(COMPILER)_$(CFG_NAME_PART)</set>
+        <set var="OBJS" make_var="1">$(COMPILER)_$(CFG_NAME_PART)</set>
         <set var="BUILDDIR">$(OBJS)</set>
     </if>
     
@@ -156,26 +161,25 @@
     <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>
-
+        <runtime-libs>$(RUNTIME_LIBS)</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">
-        <libname>$(id)$(WXDEBUGFLAG)</libname>
+    <template id="3rdparty_lib" template="common_settings,anylib">
+        <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
     </template>
 
 
@@ -196,7 +200,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>
@@ -213,7 +217,8 @@
         <include>$(INC_REGEX)</include>
     </template>
 
-    <template id="wx_append">
+    <!-- for both GUI and wxBase libs/samples: -->
+    <template id="wx_append_base">
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_TIFF)</sys-lib>
         <sys-lib>$(LIB_JPEG)</sys-lib>
@@ -238,7 +243,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>
@@ -251,13 +255,20 @@
         </if>        
     </template>
 
+    <!-- for GUI libs/samples: -->
+    <template id="wx_append" template="wx_append_base">
+        <ldlibs>$(EXTRALIBS_GUI)</ldlibs>
+    </template>
+
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
 
         <if cond="FORMAT!='autoconf'">
-            <sources>src/msw/dummy.cpp</sources>
-            <precomp-headers-gen>src/msw/dummy.cpp</precomp-headers-gen>
+            <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
+            <precomp-headers-gen>
+                $(WXTOPDIR)src/msw/dummy.cpp
+            </precomp-headers-gen>
         </if>
         <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
         <precomp-headers>on</precomp-headers>
@@ -273,6 +284,7 @@
     </template>
 
     <template id="wx_lib" template="wx_lib_b"/>
+    <template id="wx_base_lib" template="wx_lib_b"/>
     <template id="wx_dll" template="wx_dll_b" template_append="wx_append">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
@@ -281,6 +293,11 @@
         <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
+    <template id="wx_base_dll" template="wx_dll_b"
+                               template_append="wx_append_base">
+        <depends>wxzlib</depends>
+        <depends>wxregex</depends>
+    </template>
     
     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->