split win32 makefiles into shared config files and the rest

[wxWidgets.git] / build / bakefiles / common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index e26b092c5d0578d84ad16fd6956c2ddc22a65efd..9f64e18797b33a3f8049e3a7c5153d1096b8babc 100644 (file)
--- 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>
         <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>
 
     <set var="COMPILERORGCC">
         <if cond="isdefined('COMPILER')">$(COMPILER)</if>


@@ -65,17 +69,22 @@
     </set>
 
     <if cond="FORMAT=='autoconf'">
     </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="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">
         <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">
         <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
     </set>
     <set var="WXDLLNAMEPREFIXGUI">


@@ -89,10 +98,6 @@
         <if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
     </set>
 
         <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:                -->
     
     <!-- =============================================================== -->
     <!--                    Names of component libraries:                -->


@@ -161,7 +166,7 @@
         <debug-info>$(DEBUGFLAG)</debug-info>
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>multi</threading>
         <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'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>
         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>


@@ -171,13 +176,10 @@
         <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
         <dirname>$(LIBDIRNAME)</dirname>
         <install-to>$(LIBDIR)</install-to>
         <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
         <dirname>$(LIBDIRNAME)</dirname>
         <install-to>$(LIBDIR)</install-to>

-        <if cond="FORMAT!='autoconf'">
-            <cppflags>$(EXTRACFLAGS)</cppflags>
-        </if>

     </template>
 
     <template id="3rdparty_lib" template="common_settings,anylib">
     </template>
 
     <template id="3rdparty_lib" template="common_settings,anylib">

-        <libname>$(id)$(WXDEBUGFLAG)</libname>
+        <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>

     </template>
 
 
     </template>
 
 


@@ -215,7 +217,8 @@
         <include>$(INC_REGEX)</include>
     </template>
 
         <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>
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_TIFF)</sys-lib>
         <sys-lib>$(LIB_JPEG)</sys-lib>


@@ -252,6 +255,11 @@
         </if>        
     </template>
 
         </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>
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>


@@ -276,6 +284,7 @@
     </template>
 
     <template id="wx_lib" template="wx_lib_b"/>
     </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>
     <template id="wx_dll" template="wx_dll_b" template_append="wx_append">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>


@@ -284,6 +293,11 @@
         <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
         <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:        -->
     
     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->