Update msw files to use the new definitions

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 02007a089a8c515902eeca8f8c0bd0ccb1e2e87c..748bf64c7c6a4fed7bf946bf9363394af2a7ec6d 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -129,6 +129,7 @@
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
         <library>coredll</library>
         <library>basedll</library>
+        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
     </dll>
 
     <lib id="medialib" template="wx_lib"
@@ -172,6 +173,30 @@
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
 
+    <!-- ================================================================ -->
+    <!--                               wxWEB                              -->
+    <!-- ================================================================ -->
+
+    <dll id="webdll" template="wx_dll"
+         cond="SHARED=='1' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_WEB</define>
+        <sources>$(WEB_SRC)</sources>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(WEB_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="weblib" template="wx_lib"
+         cond="SHARED=='0' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">
+        <sources>$(WEB_SRC)</sources>
+        <msvc-headers>$(WEB_HDR)</msvc-headers>
+    </lib>
+
+    <wxshortcut id="wxweb" cond="MONOLITHIC=='0' and USE_WEB=='1'"/>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">web=weblib+webdll</set>
+
     <!-- ================================================================ -->
     <!--                             OpenGL                               -->
     <!-- ================================================================ -->
@@ -281,6 +306,56 @@
     <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                              -->
@@ -313,13 +388,7 @@
     <!--                            STC                                   -->
     <!-- ================================================================ -->
 
-    <template id="stc_base">
-        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
-        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
-        <define>__WX__</define>
-        <define>SCI_LEXER</define>
-        <define>LINK_LEXERS</define>
-        <cppflags-borland>-w-8027</cppflags-borland>
+    <template id="stc_base" template="wxscintilla_cppflags">
         <library>wxscintilla</library>
     </template>