fixed wrong order of libraries for contrib samples

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 9f64e18797b33a3f8049e3a7c5153d1096b8babc..c2a5e9265b32d94bc545ec138dc0e052b797319e 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -218,7 +218,7 @@
     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->
     </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>
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_TIFF)</sys-lib>
         <sys-lib>$(LIB_JPEG)</sys-lib>


@@ -256,10 +256,21 @@
     </template>
 
     <!-- for GUI libs/samples: -->
     </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>
 
         <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>
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>


@@ -285,7 +296,8 @@
 
     <template id="wx_lib" template="wx_lib_b"/>
     <template id="wx_base_lib" template="wx_lib_b"/>
 
     <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>
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>


@@ -294,7 +306,7 @@
         <depends>wxregex</depends>
     </template>
     <template id="wx_base_dll" template="wx_dll_b"
         <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>
         <depends>wxzlib</depends>
         <depends>wxregex</depends>
     </template>

diff --git a/build/bakefiles/common_contrib.bkl b/build/bakefiles/common_contrib.bkl
index 30171f866f537a556e4ef428c51bf04b6b2a2129..de7cd1f9e696012d7b97cf485a110c32103112f6 100644 (file)
--- a/build/bakefiles/common_contrib.bkl
+++ b/build/bakefiles/common_contrib.bkl
@@ -26,8 +26,6 @@
     <template id="wx_contrib_dll"
               template="wx_dll_b" template_append="wx_append">
         <include>$(CONTRIB_HDR_DIR)</include>
     <template id="wx_contrib_dll"
               template="wx_dll_b" template_append="wx_append">
         <include>$(CONTRIB_HDR_DIR)</include>

-        <!-- Always link against the wxWin library in monolithic build: -->
-        <sys-lib>$(WXLIB_MONO)</sys-lib>

     </template>
 
     
     </template>
 
     

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index 19b7fbf693415761fb6194c0159784f8afc111d7..6d9d4aa53c1266d72d98327c79841dadabe08c74 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -24,8 +24,6 @@
     
     <template id="wx_sample_b" template="wx">
         <include>$(SRCDIR)</include>
     
     <template id="wx_sample_b" template="wx">
         <include>$(SRCDIR)</include>

-        <!-- Always link against the wxWin library in monolithic build: -->
-        <sys-lib>$(WXLIB_MONO)</sys-lib>

         <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
         <define>$(DLLFLAG)</define>
     </template>
         <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
         <define>$(DLLFLAG)</define>
     </template>