Allow wxPreferencesEditor::Dismiss() to work when using modal dialogs too.

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index f2cef3f4243507d8776e88a6df550d6f433fd933..545ca64ce76d4ad286b408027e526ecd1d3a735c 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -3,6 +3,20 @@
 
 <makefile>
 
 
 <makefile>
 

+    <define-rule name="wxshortcut" extends="phony">
+        <template>
+            <set var="name">$(id.replace('wx',''))</set>
+            <set var="namedll">
+                <if cond="SHARED=='1'">$(name)dll</if>
+            </set>
+            <set var="namelib">
+                <if cond="SHARED=='0'">$(name)lib</if>
+            </set>
+            <depends>$(namedll)</depends>
+            <depends>$(namelib)</depends>
+        </template>
+    </define-rule>
+

     <!-- ================================================================= -->
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->
     <!-- ================================================================= -->
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->


@@ -22,6 +36,8 @@
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
     </lib>
 
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
     </lib>
 

+    <wxshortcut id="wxbase" cond="MONOLITHIC=='0'"/>
+

     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
 
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
 
 


@@ -44,6 +60,8 @@
         <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
     </lib>
 
         <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
     </lib>
 

+    <wxshortcut id="wxnet" cond="MONOLITHIC=='0'"/>
+

     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
 
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
 
 


@@ -68,6 +86,8 @@
         <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
 
         <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
 

+    <wxshortcut id="wxcore" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
+

     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
 
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
 
 


@@ -81,8 +101,6 @@
         <define>WXMAKINGDLL_ADV</define>
         <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
         <define>WXMAKINGDLL_ADV</define>
         <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>

-        <library>htmldll</library>
-        <library>xmldll</library>

         <library>coredll</library>
         <library>basedll</library>
         <ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
         <library>coredll</library>
         <library>basedll</library>
         <ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>


@@ -94,6 +112,8 @@
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
     </lib>
 
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
     </lib>
 

+    <wxshortcut id="wxadv" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
+

     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
 
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
 
 


@@ -109,6 +129,7 @@
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
         <library>coredll</library>
         <library>basedll</library>
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
         <library>coredll</library>
         <library>basedll</library>

+        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>

     </dll>
 
     <lib id="medialib" template="wx_lib"
     </dll>
 
     <lib id="medialib" template="wx_lib"


@@ -117,50 +138,9 @@
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
     </lib>
 
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
     </lib>
 

-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
-
-
-    <!-- ================================================================= -->
-    <!--                        DB classes library                         -->
-    <!-- ================================================================= -->
-
-    <dll id="odbcdll" template="wx_base_dll"
-         cond="SHARED=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_ODBC</define>
-        <sources>$(ODBC_SRC)</sources>
-        <msvc-headers>$(ODBC_HDR)</msvc-headers>
-        <library>basedll</library>
-        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
-    </dll>
-
-    <lib id="odbclib" template="wx_base_lib"
-        cond="SHARED=='0' and USE_ODBC=='1' and MONOLITHIC=='0'">
-        <sources>$(ODBC_SRC)</sources>
-        <msvc-headers>$(ODBC_HDR)</msvc-headers>
-    </lib>
-
-
-    <dll id="dbgriddll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_DBGRID</define>
-        <sources>$(DBGRID_SRC)</sources>
-        <msvc-headers>$(DBGRID_HDR)</msvc-headers>
-        <library>advdll</library>
-        <library>odbcdll</library>
-        <library>coredll</library>
-        <library>basedll</library>
-    </dll>
-
-    <lib id="dbgridlib" template="wx_lib"
-        cond="SHARED=='0' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
-        <sources>$(DBGRID_SRC)</sources>
-        <msvc-headers>$(DBGRID_HDR)</msvc-headers>
-    </lib>
+    <wxshortcut id="wxmedia" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_MEDIA=='1'"/>

 
 

-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>

 
 
     <!-- ================================================================ -->
 
 
     <!-- ================================================================ -->


@@ -178,14 +158,45 @@
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </dll>
 
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </dll>
 

+    <!-- use this to conditonally link against htmldll with <library>: -->
+    <set var="htmldll_library_link">
+        <if cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">htmldll</if>
+    </set>
+

     <lib id="htmllib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
         <sources>$(HTML_SRC)</sources>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>
 
     <lib id="htmllib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
         <sources>$(HTML_SRC)</sources>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>
 

+    <wxshortcut id="wxhtml" cond="MONOLITHIC=='0' and USE_HTML=='1'"/>
+

     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
 

+    <!-- ================================================================ -->
+    <!--                               wxWEBVIEW                          -->
+    <!-- ================================================================ -->
+
+    <dll id="webviewdll" template="wx_dll"
+         cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_WEBVIEW</define>
+        <sources>$(WEBVIEW_SRC)</sources>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="webviewlib" template="wx_lib"
+         cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
+        <sources>$(WEBVIEW_SRC)</sources>
+        <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
+    </lib>
+
+    <wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
+

     <!-- ================================================================ -->
     <!--                             OpenGL                               -->
     <!-- ================================================================ -->
     <!-- ================================================================ -->
     <!--                             OpenGL                               -->
     <!-- ================================================================ -->


@@ -216,6 +227,8 @@
         <msvc-headers>$(QA_HDR)</msvc-headers>
     </lib>
 
         <msvc-headers>$(QA_HDR)</msvc-headers>
     </lib>
 

+    <wxshortcut id="wxqa" cond="MONOLITHIC=='0' and USE_QA=='1'"/>
+

     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
 
     <!-- ================================================================ -->
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
 
     <!-- ================================================================ -->


@@ -238,6 +251,8 @@
         <msvc-headers>$(XML_HDR)</msvc-headers>
     </lib>
 
         <msvc-headers>$(XML_HDR)</msvc-headers>
     </lib>
 

+    <wxshortcut id="wxxml" cond="MONOLITHIC=='0'"/>
+

     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
 
     <!-- ================================================================ -->
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
 
     <!-- ================================================================ -->


@@ -249,7 +264,7 @@
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_XRC</define>
         <sources>$(XRC_SRC)</sources>
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_XRC</define>
         <sources>$(XRC_SRC)</sources>

-        <library>htmldll</library>
+        <library>$(htmldll_library_link)</library>

         <library>advdll</library>
         <library>coredll</library>
         <library>xmldll</library>
         <library>advdll</library>
         <library>coredll</library>
         <library>xmldll</library>


@@ -263,6 +278,138 @@
         <msvc-headers>$(XRC_HDR)</msvc-headers>
     </lib>
 
         <msvc-headers>$(XRC_HDR)</msvc-headers>
     </lib>
 

+    <wxshortcut id="wxxrc" cond="MONOLITHIC=='0' and USE_XRC=='1'"/>
+

     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
 

+    <!-- ================================================================ -->
+    <!--                            AUI                                   -->
+    <!-- ================================================================ -->
+
+    <dll id="auidll" template="wx_dll"
+         cond="SHARED=='1' and USE_AUI=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_AUI</define>
+        <sources>$(AUI_SRC)</sources>
+        <library>advdll</library>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(AUI_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="auilib" template="wx_lib"
+         cond="SHARED=='0' and USE_AUI=='1' and MONOLITHIC=='0'">
+        <sources>$(AUI_SRC)</sources>
+        <msvc-headers>$(AUI_HDR)</msvc-headers>
+    </lib>
+    
+    <wxshortcut id="wxaui" cond="MONOLITHIC=='0' and USE_AUI=='1'"/>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
+    
+    <!-- ================================================================ -->
+    <!--                            RIBBON                                -->
+    <!-- ================================================================ -->
+
+    <dll id="ribbondll" template="wx_dll"
+         cond="SHARED=='1' and USE_RIBBON=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_RIBBON</define>
+        <sources>$(RIBBON_SRC)</sources>
+        <library>advdll</library>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(RIBBON_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="ribbonlib" template="wx_lib"
+         cond="SHARED=='0' and USE_RIBBON=='1' and MONOLITHIC=='0'">
+        <sources>$(RIBBON_SRC)</sources>
+        <msvc-headers>$(RIBBON_HDR)</msvc-headers>
+    </lib>
+    
+    <wxshortcut id="wxribbon" cond="MONOLITHIC=='0' and USE_RIBBON=='1'"/>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">ribbon=ribbonlib+ribbondll</set>
+
+    <!-- ================================================================ -->
+    <!--                            PROPGRID                              -->
+    <!-- ================================================================ -->
+
+    <dll id="propgriddll" template="wx_dll"
+         cond="SHARED=='1' and USE_PROPGRID=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_PROPGRID</define>
+        <sources>$(PROPGRID_SRC)</sources>
+        <library>advdll</library>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(PROPGRID_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="propgridlib" template="wx_lib"
+         cond="SHARED=='0' and USE_PROPGRID=='1' and MONOLITHIC=='0'">
+        <sources>$(PROPGRID_SRC)</sources>
+        <msvc-headers>$(PROPGRID_HDR)</msvc-headers>
+    </lib>
+    
+    <wxshortcut id="wxpropgrid" cond="MONOLITHIC=='0' and USE_PROPGRID=='1'"/>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">propgrid=propgridlib+propgriddll</set>
+
+    <!-- ================================================================ -->
+    <!--                            RICHTEXT                              -->
+    <!-- ================================================================ -->
+
+    <dll id="richtextdll" template="wx_dll"
+         cond="SHARED=='1' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_RICHTEXT</define>
+        <sources>$(RICHTEXT_SRC)</sources>
+        <library>advdll</library>
+        <library>$(htmldll_library_link)</library>
+        <library>xmldll</library>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="richtextlib" template="wx_lib"
+         cond="SHARED=='0' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
+        <sources>$(RICHTEXT_SRC)</sources>
+        <msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
+    </lib>
+    
+    <wxshortcut id="wxrichtext" cond="MONOLITHIC=='0' and USE_RICHTEXT=='1'"/>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
+
+    <!-- ================================================================ -->
+    <!--                            STC                                   -->
+    <!-- ================================================================ -->
+
+    <template id="stc_base" template="wxscintilla_cppflags">
+        <library>wxscintilla</library>
+    </template>
+
+    <dll id="stcdll" template="wx_dll,stc_base"
+         cond="SHARED=='1' and USE_STC=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_STC</define>
+        <sources>$(STC_SRC)</sources>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(STC_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="stclib" template="wx_lib,stc_base"
+         cond="SHARED=='0' and USE_STC=='1' and MONOLITHIC=='0'">
+        <sources>$(STC_SRC)</sources>
+        <msvc-headers>$(STC_HDR)</msvc-headers>
+    </lib>
+    
+    <wxshortcut id="wxstc" cond="MONOLITHIC=='0' and USE_STC=='1'"/>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">stc=stclib+stcdll</set>
+

 </makefile>
 </makefile>