X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54429bb380a74d200ec735ac360599914b016266..7c3f702506c52162aa913bdf26ba180c7107c705:/build/bakefiles/monolithic.bkl

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 84313f3709..b1f7c23fd5 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -4,47 +4,37 @@
 
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
-            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
-            $(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC) $(STC_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC)
+            $(QA_SRC) $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC)
+            $(RICHTEXT_SRC) $(STC_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
         $(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
     </set>
 
-    <dll id="monodll" template="wx_dll"
-         cond="SHARED=='1' and MONOLITHIC=='1'">
+    <!-- settings common to mono{dll,lib} below -->
+    <template id="wx_monolib_or_dll" template="wxscintilla_cppflags">
         <define>wxUSE_BASE=1</define>
-        <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
+    </template>
+
+    <dll id="monodll" template="wx_dll,wx_monolib_or_dll"
+         cond="SHARED=='1' and MONOLITHIC=='1'">
+        <define>WXMAKINGDLL</define>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
-        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
+        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
-        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
-	<!-- STC stuff, should this be conditionalized? -->
-        <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>
-	<library>wxscintilla</library>
+        <library>$(wxscintilla_library_link)</library>
     </dll>
 
-    <lib id="monolib" template="wx_lib"
+    <lib id="monolib" template="wx_lib,wx_monolib_or_dll"
          cond="SHARED=='0' and MONOLITHIC=='1'">
-        <define>wxUSE_BASE=1</define>
-        <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
-        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
         <if cond="FORMAT=='watcom'">
             <set var="LIB_PAGESIZE" overwrite="1">8192</set>
         </if>
-	<!-- STC stuff, should this be conditionalized? -->
-        <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>
     </lib>