X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/452935628ae02d118e3f1d81712d8679eb64a876..aa8d7c2f9b1e50b5cf7b6ee24253c9459d7f31c4:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 9564da605f..f8b560d463 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -194,6 +194,10 @@
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
     </set>
+    
+    <set var="UNICOWS_LIB">
+        <if cond="MSLU=='1'">unicows</if>
+    </set>
 
     <template id="common_settings">
         <debug-info>$(DEBUGINFO)</debug-info>
@@ -267,6 +271,7 @@
 
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf'">
+            <sys-lib>$(UNICOWS_LIB)</sys-lib>
             <if cond="COMPILER=='bcc'">
                 <sys-lib>import32</sys-lib>
                 <sys-lib>ole2w32</sys-lib>
@@ -363,11 +368,11 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
             <msvc-file-group>wxUniv Sources:src/univ/*</msvc-file-group>
             <msvc-file-group>wxHTML Sources:src/html/*</msvc-file-group>
             <msvc-file-group>Setup Headers:*/setup.h</msvc-file-group>
-            <msvc-file-group>Common Headers:*wx/[!/]*.h</msvc-file-group>
             <msvc-file-group>MSW Headers:*wx/msw/*.h</msvc-file-group>
             <msvc-file-group>Generic Headers:*wx/generic/*.h</msvc-file-group>
             <msvc-file-group>wxUniv Headers:*wx/univ/*.h</msvc-file-group>
             <msvc-file-group>wxHTML Headers:*wx/html/*.h</msvc-file-group>
+            <msvc-file-group>Common Headers:*wx/*.h</msvc-file-group>
         </if>
     </template>
 
@@ -379,10 +384,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
         <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">
+    <template id="wx_3rdparty_dependencies">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
@@ -391,23 +393,69 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
         <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
-    <template id="wx_base_dll" template="wx_dll_b"
+    
+    <template id="wx_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
+    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_dependencies">
+        <define>wxUSE_GUI=0</define> 
+    </template>
+
+    <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">
-        <depends>wxtiff</depends>
-        <depends>wxjpeg</depends>
-        <depends>wxpng</depends>
-        <depends>wxexpat</depends>
-        <depends>wxzlib</depends>
-        <depends cond="FORMAT=='autoconf'">wxodbc</depends>
-        <depends>wxregex</depends>
+        <define>wxUSE_GUI=0</define> 
     </template>
+                           
+    <!-- =============================================================== -->
+    <!--             Templates for building wxWindows plugins:           -->
+    <!-- =============================================================== -->
+
+    <if cond="WX_STABLE_BRANCH=='1'">
+        <set var="PLUGIN_VERSION">
+            <if cond="PLATFORM_UNIX=='1'">
+                -$(WXVER_MAJOR).$(WXVER_MINOR)
+            </if>
+            <if cond="PLATFORM_UNIX=='0'">
+                $(WXVER_MAJOR)$(WXVER_MINOR)
+            </if>
+        </set>
+    </if>
+    <if cond="WX_STABLE_BRANCH=='0'">
+        <set var="PLUGIN_VERSION">
+            <if cond="PLATFORM_UNIX=='1'">
+                -$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+            </if>
+            <if cond="PLATFORM_UNIX=='0'">
+                $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
+            </if>
+        </set>
+    </if>
+
+    <define-rule name="wx-base-plugin" extends="module">
+        <template>
+            <dllname>
+                $(id)$(addPrefixIfNotEmpty('_',WXNAMESUFFIX))$(PLUGIN_VERSION)
+            </dllname>
+            <define>WXUSINGDLL</define>
+            <define>wxUSE_GUI=0</define>
+        </template>
+    </define-rule>
+    
+    <define-rule name="wx-gui-plugin" extends="module">
+        <template template="wx">
+            <dllname>
+                $(id)_$(PORTNAME)$(WXUNIVNAME)$(WXNAMESUFFIX)$(PLUGIN_VERSION)
+            </dllname>
+            <define>WXUSINGDLL</define>
+        </template>
+    </define-rule>
     
     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->
     <!-- =============================================================== -->
 
     <!-- Link against one wxWin library. Value must be literal! -->
-    <define-tag name="wx-lib" rules="exe,dll">
+    <define-tag name="wx-lib" rules="exe,dll,module">
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
     </define-tag>