X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83b9886f1772dd5d27d986a2bde9f64a69989141..a91fbc8e34b7b4bf203b03ac66f129e85cdfa53b:/build/bakefiles/monolithic.bkl diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl index 2880c8e2f4..63886c739c 100644 --- a/build/bakefiles/monolithic.bkl +++ b/build/bakefiles/monolithic.bkl @@ -4,7 +4,8 @@ <set var="MONOLIB_GUI_SRC"> <if cond="USE_GUI=='1'"> - $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC) + $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC) + $(XRC_SRC) </if> </set> <set var="MONOLIB_SRC"> @@ -15,19 +16,24 @@ cond="SHARED=='1' and MONOLITHIC=='1'"> <define>wxUSE_BASE=1</define> <define>WXMAKINGDLL</define> - <sources>$(MONOLIB_SRC)</sources> + <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources> <ldlibs>$(EXTRALIBS_XML)</ldlibs> + <ldlibs>$(EXTRALIBS_HTML)</ldlibs> <ldlibs>$(EXTRALIBS_ODBC)</ldlibs> + <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs> <msvc-headers>$(ALL_HEADERS)</msvc-headers> - <msvc-copy-setup-h/> </dll> <lib id="monolib" template="wx_lib" cond="SHARED=='0' and MONOLITHIC=='1'"> <define>wxUSE_BASE=1</define> - <sources>$(MONOLIB_SRC)</sources> + <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources> <msvc-headers>$(ALL_HEADERS)</msvc-headers> - <msvc-copy-setup-h/> </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>