don't generate install commands, not needed

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 47e48207378881b95408aa21155202c8e7169e60..144bf65ba69fb234bb59f7af9608fb4e8fb330b7 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -11,17 +11,17 @@
          cond="SHARED=='1' and MONOLITHIC=='0'">
         <define>WXMAKINGDLL_BASE</define>
         <define>wxUSE_BASE=1</define>
-        <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
+        <msvc-copy-setup-h/>
     </dll>
     
     <lib id="baselib" template="wx_base_lib"
          cond="SHARED=='0' and MONOLITHIC=='0'">
         <define>wxUSE_BASE=1</define> 
-        <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
+        <msvc-copy-setup-h/>
     </lib>
     
     
@@ -67,6 +67,67 @@
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
         <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
+    
+    
+    <!-- ================================================================= -->
+    <!--                     "Advanced" controls library                   -->
+    <!-- ================================================================= -->
+    
+    <dll id="advdll" template="wx_dll"
+         cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_ADV</define>
+        <sources>$(ADVANCED_SRC)</sources>
+        <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
+        <library>coredll</library>
+        <library>basedll</library>
+    </dll>
+    
+    <lib id="advlib" template="wx_lib"
+         cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
+        <sources>$(ADVANCED_SRC)</sources>
+        <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
+    </lib>
+    
+    
+    <!-- ================================================================= -->
+    <!--                        DB classes library                         -->
+    <!-- ================================================================= -->
+    
+    <dll id="odbcdll" template="wx_base_dll"
+         cond="SHARED=='1' and USE_GUI=='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_GUI=='1' 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>
 
     
     <!-- ================================================================ -->