added library target to regen only lib makefiles

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 8cb6872adc76a22a618bcf6b02a1306b3872b908..c2a5e9265b32d94bc545ec138dc0e052b797319e 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -98,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:                -->
@@ -170,7 +166,7 @@
         <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>
@@ -183,7 +179,7 @@
     </template>
 
     <template id="3rdparty_lib" template="common_settings,anylib">
-        <libname>$(id)$(WXDEBUGFLAG)</libname>
+        <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
     </template>
 
 
@@ -222,7 +218,7 @@
     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->
-    <template id="wx_append_base">
+    <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_TIFF)</sys-lib>
         <sys-lib>$(LIB_JPEG)</sys-lib>
@@ -260,10 +256,21 @@
     </template>
 
     <!-- for GUI libs/samples: -->
-    <template id="wx_append" template="wx_append_base">
+    <template id="wx_append_nomono" template="wx_append_base_nomono">
         <ldlibs>$(EXTRALIBS_GUI)</ldlibs>
     </template>
 
+
+    <template id="wx_append_base" template_append="wx_append_base_nomono">
+        <!-- Always link against the wxWin library in monolithic build: -->
+        <sys-lib>$(WXLIB_MONO)</sys-lib>
+    </template>
+    <template id="wx_append" template_append="wx_append_nomono">
+        <!-- Always link against the wxWin library in monolithic build: -->
+        <sys-lib>$(WXLIB_MONO)</sys-lib>
+    </template>
+    
+
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
@@ -289,7 +296,8 @@
 
     <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">
+    <template id="wx_dll" template="wx_dll_b"
+                          template_append="wx_append_nomono">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
@@ -298,7 +306,7 @@
         <depends>wxregex</depends>
     </template>
     <template id="wx_base_dll" template="wx_dll_b"
-                               template_append="wx_append_base">
+                               template_append="wx_append_base_nomono">
         <depends>wxzlib</depends>
         <depends>wxregex</depends>
     </template>