static libs depend on 3rd party ones now, too (for convenience)

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 9564da605fdca5898f245d9cf0717351876d32f4..aac290e174db681d9a5105f50063287590af55c3 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -379,20 +379,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
         <mac_version>$(WXMACVERSION)</mac_version>
     </template>
 
         <mac_version>$(WXMACVERSION)</mac_version>
     </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_nomono">
-        <depends>wxtiff</depends>
-        <depends>wxjpeg</depends>
-        <depends>wxpng</depends>
-        <depends>wxexpat</depends>
-        <depends>wxzlib</depends>
-        <depends cond="FORMAT=='autoconf'">wxodbc</depends>
-        <depends>wxregex</depends>
-    </template>
-    <template id="wx_base_dll" template="wx_dll_b"
-                               template_append="wx_append_base_nomono">
+    <template id="wx_3rdparty_dependencies">

         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>


@@ -402,6 +389,13 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
         <depends>wxregex</depends>
     </template>
     
         <depends>wxregex</depends>
     </template>
     

+    <template id="wx_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
+    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
+    <template id="wx_dll" template="wx_dll_b,wx_3rdparty_dependencies"
+                          template_append="wx_append_nomono"/>
+    <template id="wx_base_dll" template="wx_dll_b,wx_3rdparty_dependencies"
+                               template_append="wx_append_base_nomono"/>
+    

     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->
     <!-- =============================================================== -->
     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->
     <!-- =============================================================== -->

diff --git a/build/wx.dsw b/build/wx.dsw
index e1f44371e08f80bd9c9d1d4ab99ad9033ed23649..c9d80de5f581e2bc45f2bea55b8291acdc799e64 100644 (file)
--- a/build/wx.dsw
+++ b/build/wx.dsw
@@ -46,6 +46,24 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################


@@ -88,6 +106,24 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################


@@ -133,6 +169,24 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################


@@ -187,6 +241,24 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################


@@ -229,6 +301,24 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################


@@ -277,6 +367,24 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################


@@ -322,6 +430,24 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################


@@ -367,6 +493,24 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################


@@ -484,6 +628,24 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################