projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed problems caused by duplicated names across different style types.
[wxWidgets.git]
/
build
/
bakefiles
/
monolithic.bkl
diff --git
a/build/bakefiles/monolithic.bkl
b/build/bakefiles/monolithic.bkl
index a41b78697babbc8aa411b83c5c862302208e7854..1ad6d4af0247504f858b61d2b918b3fb4eca0b9e 100644
(file)
--- a/
build/bakefiles/monolithic.bkl
+++ b/
build/bakefiles/monolithic.bkl
@@
-4,31
+4,37
@@
<set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'">
<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)
+ $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_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>
</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>wxUSE_BASE=1</define>
- <define>WXMAKINGDLL</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<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_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
- <ldlibs>$(EXTRALIBS_
ODBC
)</ldlibs>
+ <ldlibs>$(EXTRALIBS_
MEDIA
)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
- <
msvc-headers>$(ALL_HEADERS)</msvc-headers
>
+ <
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>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
>
</lib>
</lib>