Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always add libwxscintilla in monolithic mode.

Browse Source 
The library was already present in the makefiles but came before the
monolithic library itself, which broke the linking of the samples when using
GNU ld as the dependent libraries must come after the libraries using them.

Closes #13837.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-06 12:41:02 +00:00
parent bed99c2256
commit a4830bb560
854 changed files with 3424 additions and 1851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/bakefiles/common.bkl
View File

@@ -635,6 +635,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<if cond="MONOLITHIC=='1'">$(LIB_PNG)</if>
</set>
<set var="LIB_SCINTILLA_IF_MONO">
<if cond="MONOLITHIC=='1'">$(LIB_SCINTILLA)</if>
</set>
<template id="wx_append_base" template_append="wx_append_base_nomono">
<!-- Always link against the full wx library in monolithic build and
also against the PNG one as core code references it for Tango
@@ -645,6 +649,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
<sys-lib>$(LIB_SCINTILLA_IF_MONO)</sys-lib>
</template>