solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Update bakefile with Scintilla and Lexilla changes

Browse source
This commit is contained in:
Maarten Bent 2023-01-28 23:45:44 +01:00
parent e3622c0f2d
commit c8c254db1a
No known key found for this signature in database
GPG key ID: 58AAEE3F4A4FD070
9 changed files with 203 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build/bakefiles/common.bkl
View file

@ -529,6 +529,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
<include file="tiff.bkl"/>
<include file="expat.bkl"/>
<include file="scintilla.bkl"/>
<include file="lexilla.bkl"/>
<!-- =============================================================== -->
@ -649,6 +650,9 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
<set var="LIB_SCINTILLA_IF_MONO">
<if cond="MONOLITHIC=='1' and USE_STC=='1'">$(LIB_SCINTILLA)</if>
</set>
<set var="LIB_LEXILLA_IF_MONO">
<if cond="MONOLITHIC=='1' and USE_STC=='1'">$(LIB_LEXILLA)</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
@ -660,6 +664,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
<sys-lib>$(LIB_SCINTILLA_IF_MONO)</sys-lib>
<sys-lib>$(LIB_LEXILLA_IF_MONO)</sys-lib>
</template>
@ -752,6 +757,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
<depends>wxjpeg</depends>
<depends>wxpng</depends>
<depends>wxscintilla</depends>
<depends>wxlexilla</depends>
</template>
<template id="wx_3rdparty_includes_base">

176
build/bakefiles/lexilla.bkl Normal file
View file

@ -0,0 +1,176 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<set var="LIB_LEXILLA">
wxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="LIB_LEXILLA">
wxlexilla$(WXDEBUGFLAG)$(HOST_SUFFIX)
</set>
</if>
<template id="wxlexilla_cppflags">
<include>$(TOP_SRCDIR)src/stc/lexilla/access</include>
<include>$(TOP_SRCDIR)src/stc/lexilla/include</include>
<include>$(TOP_SRCDIR)src/stc/lexilla/lexlib</include>
<include>$(TOP_SRCDIR)src/stc/lexilla/include</include>
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
</template>
<set var="wxlexilla_usingdll">
<if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
</set>
<lib id="wxlexilla" template="3rdparty_lib,wxlexilla_cppflags,msvc_setup_h"
cond="USE_STC=='1' and BUILDING_LIB=='1'">
<if cond="FORMAT!='autoconf'">
<include>$(SETUPHDIR)</include>
<include>$(TOP_SRCDIR)include</include>
</if>
<define>$(wxlexilla_usingdll)</define>
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<define>$(DEBUG_DEFINE)</define>
<dirname>$(LIBDIRNAME)</dirname>
<sources>
src/stc/lexilla/access/LexillaAccess.cxx
src/stc/lexilla/lexers/LexA68k.cxx
src/stc/lexilla/lexers/LexAPDL.cxx
src/stc/lexilla/lexers/LexASY.cxx
src/stc/lexilla/lexers/LexAU3.cxx
src/stc/lexilla/lexers/LexAVE.cxx
src/stc/lexilla/lexers/LexAVS.cxx
src/stc/lexilla/lexers/LexAbaqus.cxx
src/stc/lexilla/lexers/LexAda.cxx
src/stc/lexilla/lexers/LexAsm.cxx
src/stc/lexilla/lexers/LexAsn1.cxx
src/stc/lexilla/lexers/LexBaan.cxx
src/stc/lexilla/lexers/LexBash.cxx
src/stc/lexilla/lexers/LexBasic.cxx
src/stc/lexilla/lexers/LexBatch.cxx
src/stc/lexilla/lexers/LexBibTeX.cxx
src/stc/lexilla/lexers/LexBullant.cxx
src/stc/lexilla/lexers/LexCIL.cxx
src/stc/lexilla/lexers/LexCLW.cxx
src/stc/lexilla/lexers/LexCOBOL.cxx
src/stc/lexilla/lexers/LexCPP.cxx
src/stc/lexilla/lexers/LexCSS.cxx
src/stc/lexilla/lexers/LexCaml.cxx
src/stc/lexilla/lexers/LexCmake.cxx
src/stc/lexilla/lexers/LexCoffeeScript.cxx
src/stc/lexilla/lexers/LexConf.cxx
src/stc/lexilla/lexers/LexCrontab.cxx
src/stc/lexilla/lexers/LexCsound.cxx
src/stc/lexilla/lexers/LexD.cxx
src/stc/lexilla/lexers/LexDMAP.cxx
src/stc/lexilla/lexers/LexDMIS.cxx
src/stc/lexilla/lexers/LexDataflex.cxx
src/stc/lexilla/lexers/LexDiff.cxx
src/stc/lexilla/lexers/LexECL.cxx
src/stc/lexilla/lexers/LexEDIFACT.cxx
src/stc/lexilla/lexers/LexEScript.cxx
src/stc/lexilla/lexers/LexEiffel.cxx
src/stc/lexilla/lexers/LexErlang.cxx
src/stc/lexilla/lexers/LexErrorList.cxx
src/stc/lexilla/lexers/LexFSharp.cxx
src/stc/lexilla/lexers/LexFlagship.cxx
src/stc/lexilla/lexers/LexForth.cxx
src/stc/lexilla/lexers/LexFortran.cxx
src/stc/lexilla/lexers/LexGAP.cxx
src/stc/lexilla/lexers/LexGui4Cli.cxx
src/stc/lexilla/lexers/LexHTML.cxx
src/stc/lexilla/lexers/LexHaskell.cxx
src/stc/lexilla/lexers/LexHex.cxx
src/stc/lexilla/lexers/LexHollywood.cxx
src/stc/lexilla/lexers/LexIndent.cxx
src/stc/lexilla/lexers/LexInno.cxx
src/stc/lexilla/lexers/LexJSON.cxx
src/stc/lexilla/lexers/LexKVIrc.cxx
src/stc/lexilla/lexers/LexKix.cxx
src/stc/lexilla/lexers/LexLaTeX.cxx
src/stc/lexilla/lexers/LexLisp.cxx
src/stc/lexilla/lexers/LexLout.cxx
src/stc/lexilla/lexers/LexLua.cxx
src/stc/lexilla/lexers/LexMMIXAL.cxx
src/stc/lexilla/lexers/LexMPT.cxx
src/stc/lexilla/lexers/LexMSSQL.cxx
src/stc/lexilla/lexers/LexMagik.cxx
src/stc/lexilla/lexers/LexMake.cxx
src/stc/lexilla/lexers/LexMarkdown.cxx
src/stc/lexilla/lexers/LexMatlab.cxx
src/stc/lexilla/lexers/LexMaxima.cxx
src/stc/lexilla/lexers/LexMetapost.cxx
src/stc/lexilla/lexers/LexModula.cxx
src/stc/lexilla/lexers/LexMySQL.cxx
src/stc/lexilla/lexers/LexNim.cxx
src/stc/lexilla/lexers/LexNimrod.cxx
src/stc/lexilla/lexers/LexNsis.cxx
src/stc/lexilla/lexers/LexNull.cxx
src/stc/lexilla/lexers/LexOScript.cxx
src/stc/lexilla/lexers/LexOpal.cxx
src/stc/lexilla/lexers/LexPB.cxx
src/stc/lexilla/lexers/LexPLM.cxx
src/stc/lexilla/lexers/LexPO.cxx
src/stc/lexilla/lexers/LexPOV.cxx
src/stc/lexilla/lexers/LexPS.cxx
src/stc/lexilla/lexers/LexPascal.cxx
src/stc/lexilla/lexers/LexPerl.cxx
src/stc/lexilla/lexers/LexPowerPro.cxx
src/stc/lexilla/lexers/LexPowerShell.cxx
src/stc/lexilla/lexers/LexProgress.cxx
src/stc/lexilla/lexers/LexProps.cxx
src/stc/lexilla/lexers/LexPython.cxx
src/stc/lexilla/lexers/LexR.cxx
src/stc/lexilla/lexers/LexRaku.cxx
src/stc/lexilla/lexers/LexRebol.cxx
src/stc/lexilla/lexers/LexRegistry.cxx
src/stc/lexilla/lexers/LexRuby.cxx
src/stc/lexilla/lexers/LexRust.cxx
src/stc/lexilla/lexers/LexSAS.cxx
src/stc/lexilla/lexers/LexSML.cxx
src/stc/lexilla/lexers/LexSQL.cxx
src/stc/lexilla/lexers/LexSTTXT.cxx
src/stc/lexilla/lexers/LexScriptol.cxx
src/stc/lexilla/lexers/LexSmalltalk.cxx
src/stc/lexilla/lexers/LexSorcus.cxx
src/stc/lexilla/lexers/LexSpecman.cxx
src/stc/lexilla/lexers/LexSpice.cxx
src/stc/lexilla/lexers/LexStata.cxx
src/stc/lexilla/lexers/LexTACL.cxx
src/stc/lexilla/lexers/LexTADS3.cxx
src/stc/lexilla/lexers/LexTAL.cxx
src/stc/lexilla/lexers/LexTCL.cxx
src/stc/lexilla/lexers/LexTCMD.cxx
src/stc/lexilla/lexers/LexTeX.cxx
src/stc/lexilla/lexers/LexTxt2tags.cxx
src/stc/lexilla/lexers/LexVB.cxx
src/stc/lexilla/lexers/LexVHDL.cxx
src/stc/lexilla/lexers/LexVerilog.cxx
src/stc/lexilla/lexers/LexVisualProlog.cxx
src/stc/lexilla/lexers/LexX12.cxx
src/stc/lexilla/lexers/LexYAML.cxx
src/stc/lexilla/lexlib/Accessor.cxx
<!-- src/stc/lexilla/lexlib/CharacterCategory.cxx -->
<!-- src/stc/lexilla/lexlib/CharacterSet.cxx -->
src/stc/lexilla/lexlib/DefaultLexer.cxx
src/stc/lexilla/lexlib/LexerBase.cxx
src/stc/lexilla/lexlib/LexerModule.cxx
src/stc/lexilla/lexlib/LexerNoExceptions.cxx
src/stc/lexilla/lexlib/LexerSimple.cxx
src/stc/lexilla/lexlib/PropSetSimple.cxx
src/stc/lexilla/lexlib/StyleContext.cxx
src/stc/lexilla/lexlib/WordList.cxx
src/stc/lexilla/src/Lexilla.cxx
</sources>
</lib>
<!-- used to conditionally link against wxlexilla only if it's enabled -->
<set var="wxlexilla_library_link">
<if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxlexilla</if>
</set>
</makefile>

13
build/bakefiles/make_dist.mk
View file

@ -18,6 +18,8 @@ AUIDIR = $(WXDIR)/src/aui
RIBBONDIR = $(WXDIR)/src/ribbon
PROPGRIDDIR = $(WXDIR)/src/propgrid
STCDIR = $(WXDIR)/src/stc
SCINTILLADIR = $(WXDIR)/src/stc/scintilla
LEXILLADIR = $(WXDIR)/src/stc/lexilla
UNIXDIR = $(WXDIR)/src/unix
PNGDIR = $(WXDIR)/src/png
JPEGDIR = $(WXDIR)/src/jpeg
@ -217,12 +219,13 @@ ALL_GUI_DIST: ALL_DIST
$(CP_P) $(PROPGRIDDIR)/*.cpp $(DISTDIR)/src/propgrid
mkdir $(DISTDIR)/src/stc
mkdir $(DISTDIR)/src/stc/scintilla
mkdir $(DISTDIR)/src/stc/scintilla/src
mkdir $(DISTDIR)/src/stc/scintilla/include
$(CP_P) $(STCDIR)/*.* $(DISTDIR)/src/stc
$(CP_P) $(STCDIR)/scintilla/src/* $(DISTDIR)/src/stc/scintilla/src
$(CP_P) $(STCDIR)/scintilla/include/* $(DISTDIR)/src/stc/scintilla/include
mkdir $(DISTDIR)/src/stc/scintilla
$(CP_PR) $(SCINTILLADIR)/* $(DISTDIR)/src/stc/scintilla
mkdir $(DISTDIR)/src/stc/lexilla
$(CP_PR) $(LEXILLADIR)/* $(DISTDIR)/src/stc/lexilla
mkdir $(DISTDIR)/src/png
$(CP_PR) $(PNGDIR)/* $(DISTDIR)/src/png

3
build/bakefiles/monolithic.bkl
View file

@ -19,7 +19,7 @@
</set>
<!-- settings common to mono{dll,lib} below -->
<template id="wx_monolib_or_dll" template="wxscintilla_cppflags,webview_additional">
<template id="wx_monolib_or_dll" template="wxscintilla_cppflags,wxlexilla_cppflags,webview_additional">
<define>wxUSE_BASE=1</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
@ -35,6 +35,7 @@
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
<library>$(wxscintilla_library_link)</library>
<library>$(wxlexilla_library_link)</library>
</dll>
<lib id="monolib" template="wx_lib,wx_monolib_or_dll"

3
build/bakefiles/multilib.bkl
View file

@ -383,8 +383,9 @@
<!-- STC -->
<!-- ================================================================ -->
<template id="stc_base" template="wxscintilla_cppflags">
<template id="stc_base" template="wxscintilla_cppflags,wxlexilla_cppflags">
<library>wxscintilla</library>
<library>wxlexilla</library>
</template>
<dll id="stcdll" template="wx_dll,stc_base"

141
build/bakefiles/scintilla.bkl
View file

@ -11,15 +11,13 @@
wxscintilla$(WXDEBUGFLAG)$(HOST_SUFFIX)
</set>
</if>
<set var="INC_SCINTILLA">
$(TOP_SRCDIR)src/stc/scintilla/include
</set>
<!-- automatically update generated files when building the library -->
<if cond="BUILDING_LIB=='1'">
<fragment format='autoconf'>
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/lexilla/include/LexicalStyles.iface \
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
@ -31,12 +29,8 @@
<template id="wxscintilla_cppflags">
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
<include>$(TOP_SRCDIR)src/stc/scintilla/lexlib</include>
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
<define>__WX__</define>
<define>SCI_LEXER</define>
<define>LINK_LEXERS</define>
<cppflags-borland>-w-8027</cppflags-borland>
</template>
<set var="wxscintilla_usingdll">
@ -53,150 +47,23 @@
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<define>$(DEBUG_DEFINE)</define>
<define>LPEG_LEXER=0</define>
<dirname>$(LIBDIRNAME)</dirname>
<sources>
src/stc/scintilla/lexers/LexA68k.cxx
src/stc/scintilla/lexers/LexAbaqus.cxx
src/stc/scintilla/lexers/LexAda.cxx
src/stc/scintilla/lexers/LexAPDL.cxx
src/stc/scintilla/lexers/LexAsm.cxx
src/stc/scintilla/lexers/LexAsn1.cxx
src/stc/scintilla/lexers/LexASY.cxx
src/stc/scintilla/lexers/LexAU3.cxx
src/stc/scintilla/lexers/LexAVE.cxx
src/stc/scintilla/lexers/LexAVS.cxx
src/stc/scintilla/lexers/LexBaan.cxx
src/stc/scintilla/lexers/LexBash.cxx
src/stc/scintilla/lexers/LexBasic.cxx
src/stc/scintilla/lexers/LexBatch.cxx
src/stc/scintilla/lexers/LexBibTeX.cxx
src/stc/scintilla/lexers/LexBullant.cxx
src/stc/scintilla/lexers/LexCaml.cxx
src/stc/scintilla/lexers/LexCIL.cxx
src/stc/scintilla/lexers/LexCLW.cxx
src/stc/scintilla/lexers/LexCmake.cxx
src/stc/scintilla/lexers/LexCOBOL.cxx
src/stc/scintilla/lexers/LexCoffeeScript.cxx
src/stc/scintilla/lexers/LexConf.cxx
src/stc/scintilla/lexers/LexCPP.cxx
src/stc/scintilla/lexers/LexCrontab.cxx
src/stc/scintilla/lexers/LexCsound.cxx
src/stc/scintilla/lexers/LexCSS.cxx
src/stc/scintilla/lexers/LexD.cxx
src/stc/scintilla/lexers/LexDataflex.cxx
src/stc/scintilla/lexers/LexDiff.cxx
src/stc/scintilla/lexers/LexDMAP.cxx
src/stc/scintilla/lexers/LexDMIS.cxx
src/stc/scintilla/lexers/LexECL.cxx
src/stc/scintilla/lexers/LexEDIFACT.cxx
src/stc/scintilla/lexers/LexEiffel.cxx
src/stc/scintilla/lexers/LexErlang.cxx
src/stc/scintilla/lexers/LexErrorList.cxx
src/stc/scintilla/lexers/LexEScript.cxx
src/stc/scintilla/lexers/LexFlagship.cxx
src/stc/scintilla/lexers/LexForth.cxx
src/stc/scintilla/lexers/LexFortran.cxx
src/stc/scintilla/lexers/LexGAP.cxx
src/stc/scintilla/lexers/LexGui4Cli.cxx
src/stc/scintilla/lexers/LexHaskell.cxx
src/stc/scintilla/lexers/LexHex.cxx
src/stc/scintilla/lexers/LexHollywood.cxx
src/stc/scintilla/lexers/LexHTML.cxx
src/stc/scintilla/lexers/LexIndent.cxx
src/stc/scintilla/lexers/LexInno.cxx
src/stc/scintilla/lexers/LexJSON.cxx
src/stc/scintilla/lexers/LexKix.cxx
src/stc/scintilla/lexers/LexKVIrc.cxx
src/stc/scintilla/lexers/LexLaTeX.cxx
src/stc/scintilla/lexers/LexLisp.cxx
src/stc/scintilla/lexers/LexLout.cxx
src/stc/scintilla/lexers/LexLPeg.cxx
src/stc/scintilla/lexers/LexLua.cxx
src/stc/scintilla/lexers/LexMagik.cxx
src/stc/scintilla/lexers/LexMake.cxx
src/stc/scintilla/lexers/LexMarkdown.cxx
src/stc/scintilla/lexers/LexMatlab.cxx
src/stc/scintilla/lexers/LexMaxima.cxx
src/stc/scintilla/lexers/LexMetapost.cxx
src/stc/scintilla/lexers/LexMMIXAL.cxx
src/stc/scintilla/lexers/LexModula.cxx
src/stc/scintilla/lexers/LexMPT.cxx
src/stc/scintilla/lexers/LexMSSQL.cxx
src/stc/scintilla/lexers/LexMySQL.cxx
src/stc/scintilla/lexers/LexNim.cxx
src/stc/scintilla/lexers/LexNimrod.cxx
src/stc/scintilla/lexers/LexNsis.cxx
src/stc/scintilla/lexers/LexNull.cxx
src/stc/scintilla/lexers/LexOpal.cxx
src/stc/scintilla/lexers/LexOScript.cxx
src/stc/scintilla/lexers/LexPascal.cxx
src/stc/scintilla/lexers/LexPB.cxx
src/stc/scintilla/lexers/LexPerl.cxx
src/stc/scintilla/lexers/LexPLM.cxx
src/stc/scintilla/lexers/LexPO.cxx
src/stc/scintilla/lexers/LexPOV.cxx
src/stc/scintilla/lexers/LexPowerPro.cxx
src/stc/scintilla/lexers/LexPowerShell.cxx
src/stc/scintilla/lexers/LexProgress.cxx
src/stc/scintilla/lexers/LexProps.cxx
src/stc/scintilla/lexers/LexPS.cxx
src/stc/scintilla/lexers/LexPython.cxx
src/stc/scintilla/lexers/LexR.cxx
src/stc/scintilla/lexers/LexRaku.cxx
src/stc/scintilla/lexers/LexRebol.cxx
src/stc/scintilla/lexers/LexRegistry.cxx
src/stc/scintilla/lexers/LexRuby.cxx
src/stc/scintilla/lexers/LexRust.cxx
src/stc/scintilla/lexers/LexSAS.cxx
src/stc/scintilla/lexers/LexScriptol.cxx
src/stc/scintilla/lexers/LexSmalltalk.cxx
src/stc/scintilla/lexers/LexSML.cxx
src/stc/scintilla/lexers/LexSorcus.cxx
src/stc/scintilla/lexers/LexSpecman.cxx
src/stc/scintilla/lexers/LexSpice.cxx
src/stc/scintilla/lexers/LexSQL.cxx
src/stc/scintilla/lexers/LexStata.cxx
src/stc/scintilla/lexers/LexSTTXT.cxx
src/stc/scintilla/lexers/LexTACL.cxx
src/stc/scintilla/lexers/LexTADS3.cxx
src/stc/scintilla/lexers/LexTAL.cxx
src/stc/scintilla/lexers/LexTCL.cxx
src/stc/scintilla/lexers/LexTCMD.cxx
src/stc/scintilla/lexers/LexTeX.cxx
src/stc/scintilla/lexers/LexTxt2tags.cxx
src/stc/scintilla/lexers/LexVB.cxx
src/stc/scintilla/lexers/LexVerilog.cxx
src/stc/scintilla/lexers/LexVHDL.cxx
src/stc/scintilla/lexers/LexVisualProlog.cxx
src/stc/scintilla/lexers/LexX12.cxx
src/stc/scintilla/lexers/LexYAML.cxx
src/stc/scintilla/lexlib/Accessor.cxx
src/stc/scintilla/lexlib/CharacterCategory.cxx
src/stc/scintilla/lexlib/CharacterSet.cxx
src/stc/scintilla/lexlib/DefaultLexer.cxx
src/stc/scintilla/lexlib/LexerBase.cxx
src/stc/scintilla/lexlib/LexerModule.cxx
src/stc/scintilla/lexlib/LexerNoExceptions.cxx
src/stc/scintilla/lexlib/LexerSimple.cxx
src/stc/scintilla/lexlib/PropSetSimple.cxx
src/stc/scintilla/lexlib/StyleContext.cxx
src/stc/scintilla/lexlib/WordList.cxx
src/stc/scintilla/src/AutoComplete.cxx
src/stc/scintilla/src/CallTip.cxx
src/stc/scintilla/src/CaseConvert.cxx
src/stc/scintilla/src/CaseFolder.cxx
src/stc/scintilla/src/Catalogue.cxx
src/stc/scintilla/src/CellBuffer.cxx
src/stc/scintilla/src/CharClassify.cxx
src/stc/scintilla/src/CharacterCategory.cxx
src/stc/scintilla/src/CharacterSet.cxx
src/stc/scintilla/src/ContractionState.cxx
src/stc/scintilla/src/DBCS.cxx
src/stc/scintilla/src/Decoration.cxx
src/stc/scintilla/src/Document.cxx
src/stc/scintilla/src/EditModel.cxx
src/stc/scintilla/src/Editor.cxx
src/stc/scintilla/src/EditView.cxx
src/stc/scintilla/src/ExternalLexer.cxx
src/stc/scintilla/src/Editor.cxx
src/stc/scintilla/src/Indicator.cxx
src/stc/scintilla/src/KeyMap.cxx
src/stc/scintilla/src/LineMarker.cxx

5
build/bakefiles/wxpresets/presets/wx_win32.bkl
View file

@ -209,10 +209,11 @@
</if>
<if cond="value=='stc'">
<!-- wxSTC requires also the basic scintilla library
which is built as a separate 3rd party library -->
<!-- wxSTC requires also the basic scintilla and lexilla libraries
which are built as a separate 3rd party libraries -->
<sys-lib>$(WXLIB_STC_NAME)</sys-lib>
<sys-lib>wxscintilla$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
<sys-lib>wxlexilla$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
</if>
<if cond="value not in WX_LIB_LIST.split()">

1
samples/stc/stctest.bkl
View file

@ -6,6 +6,7 @@
<template id="stc_append" template="wx_append">
<if cond="OUT_OF_TREE_MAKEFILES=='0'">
<sys-lib>$(LIB_SCINTILLA)</sys-lib>
<sys-lib>$(LIB_LEXILLA)</sys-lib>
<ldlibs>$(EXTRALIBS_STC)</ldlibs>
</if>
</template>

1
samples/webview/webview.bkl
View file

@ -14,6 +14,7 @@
<wx-lib>base</wx-lib>
<if cond="OUT_OF_TREE_MAKEFILES=='0'">
<sys-lib>$(LIB_SCINTILLA)</sys-lib>
<sys-lib>$(LIB_LEXILLA)</sys-lib>
</if>
</exe>