added wx-lib template for building static libs (no linking)

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

diff --git a/build/bakefiles/wxpresets/presets/wx_unix.bkl b/build/bakefiles/wxpresets/presets/wx_unix.bkl
index a9d3d3684de570ab8453fa7c9ce8f4e05a144ac1..6cf291d7c221d46837e8ac36886764477e7e347a 100644 (file)
--- a/build/bakefiles/wxpresets/presets/wx_unix.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_unix.bkl
@@ -73,9 +73,12 @@ Format-specific notes:
         </error>
     </if>
     
         </error>
     </if>
     

-    <template id="wx">
+    <template id="wx-lib">

         <cxxflags>$(WX_CXXFLAGS)</cxxflags>
         <cflags>$(WX_CFLAGS)</cflags>
         <cxxflags>$(WX_CXXFLAGS)</cxxflags>
         <cflags>$(WX_CFLAGS)</cflags>

+    </template>
+
+    <template id="wx" template="wx-lib">

         <ldlibs>$(WX_LIBS)</ldlibs>
     </template>
 
         <ldlibs>$(WX_LIBS)</ldlibs>
     </template>
 

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index fbc2759cc270eff2b78b47abc5022a0218d788f6..afabe9fcf3c577712a0ffc70d30693717e31d8f3 100644 (file)
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -167,7 +167,8 @@ FIXME: this template has (at least) the following bugs:
               position="before:__wx-libs-point"/>
     
 
               position="before:__wx-libs-point"/>
     
 

-    <template id="wx">
+    <!-- template for static wx libraries: -->
+    <template id="wx-lib">

         <!--                    MISCELLANEOUS                       -->
         <if cond="FORMAT=='mingw'">                    
             <define>HAVE_W32API_H</define>
         <!--                    MISCELLANEOUS                       -->
         <if cond="FORMAT=='mingw'">                    
             <define>HAVE_W32API_H</define>


@@ -180,7 +181,11 @@ FIXME: this template has (at least) the following bugs:
 
         <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
         <include>$(WX_DIR)/include</include>
 
         <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
         <include>$(WX_DIR)/include</include>

-
+    </template>
+    
+   
+    <!-- template for wx executables/dlls: -->
+    <template id="wx" template="wx-lib">

         <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
 
         <!-- wx libs must come before 3rd party and sys libs, this is
         <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
 
         <!-- wx libs must come before 3rd party and sys libs, this is