X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c79241a238663d524ba4b9b63bcf9952f3d58609..ba27f249befb0e8ddaf696ee48368426aac72e2f:/build/bakefiles/monolithic.bkl diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl index a5ea3ae4cd..82a35dd4cf 100644 --- a/build/bakefiles/monolithic.bkl +++ b/build/bakefiles/monolithic.bkl @@ -1,10 +1,11 @@ <?xml version="1.0" ?> <!-- $Id$ --> <makefile> - + <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) $(QA_SRC) + $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RICHTEXT_SRC) $(STC_SRC) </if> </set> <set var="MONOLIB_SRC"> @@ -13,21 +14,42 @@ <dll id="monodll" template="wx_dll" cond="SHARED=='1' and MONOLITHIC=='1'"> - <define>wxUSE_BASE=1</define> + <define>wxUSE_BASE=1</define> <define>WXMAKINGDLL</define> <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources> <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_link)</library> </dll> - + <lib id="monolib" template="wx_lib" cond="SHARED=='0' and MONOLITHIC=='1'"> - <define>wxUSE_BASE=1</define> + <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> + + <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>