Fix two common case of hybrid build:

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 5a04aa477a082bbc1dcd9985926a2a16ea8ef3d6..d67fed5f40d55820f79dd5c2b68a50e2596bb5b7 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -3,7 +3,9 @@
 <makefile>
     
     <set var="MONOLIB_GUI_SRC">
-        <if cond="USE_GUI=='1'">$(CORE_SRC) $(HTML_SRC)</if>
+        <if cond="USE_GUI=='1'">
+            $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)
+        </if>
     </set>
     <set var="MONOLIB_SRC">
         $(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
@@ -15,8 +17,8 @@
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC)</sources>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
+        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
-        <msvc-copy-setup-h/>
     </dll>
     
     <lib id="monolib" template="wx_lib"