Enable using jom in place of nmake in the wxMSW build

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 02670d651c448deb6fd361d6f1da52287342da90..b1f7c23fd569ac3b964c292a4aa20cf7e2f568dc 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -2,24 +2,44 @@
 <!-- $Id$ -->
 <makefile>
 
 <!-- $Id$ -->
 <makefile>
 

-    <dll id="monodll" template="wx_dll"
+    <set var="MONOLIB_GUI_SRC">
+        <if cond="USE_GUI=='1'">
+            $(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>
+
+    <!-- settings common to mono{dll,lib} below -->
+    <template id="wx_monolib_or_dll" template="wxscintilla_cppflags">
+        <define>wxUSE_BASE=1</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'">
          cond="SHARED=='1' and MONOLITHIC=='1'">

-        <define>__WXBASE__</define> 

         <define>WXMAKINGDLL</define>
         <define>WXMAKINGDLL</define>

-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)</sources>
-      
-        <library>$(LIB_ZLIB)</library>
-        <library>$(LIB_REGEX)</library>
-        <library>$(LIB_PNG)</library>
-        <library>$(LIB_JPEG)</library>
-        <library>$(LIB_TIFF)</library>
-        <library>$(LIB_ODBC)</library>
+        <ldlibs>$(EXTRALIBS_XML)</ldlibs>
+        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
+        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
+        <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
+        <library>$(wxscintilla_library_link)</library>

     </dll>
     </dll>

-    
-    <lib id="monolib" template="wx_lib"
+
+    <lib id="monolib" template="wx_lib,wx_monolib_or_dll"

          cond="SHARED=='0' and MONOLITHIC=='1'">
          cond="SHARED=='0' and MONOLITHIC=='1'">

-        <define>__WXBASE__</define> 
-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)</sources>
+        <if cond="FORMAT=='watcom'">
+            <set var="LIB_PAGESIZE" overwrite="1">8192</set>
+        </if>

     </lib>
 
     </lib>
 

+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">mono=monolib+monodll</set>
+    <!-- included by wx.bkl from opengl.bkl -->
+    <set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">gl=gllib+gldll</set>
+

 </makefile>
 </makefile>