From 2af3719a4eccff2bf12fc70087b29f1f7ef63e25 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 28 Jul 2020 22:57:27 +0200 Subject: [PATCH] Add new scintilla sources to build systems Mention updating the CMake file in the readme. Remove NO_CXX11_REGEX from scintilla build. Manually update vcxproj files. Define LPEG_LEXER=0, prevent LPEG_LEXER is not defined error. --- Makefile.in | 138 +++++++---- build/bakefiles/scintilla.bkl | 18 +- build/cmake/lib/stc/CMakeLists.txt | 23 +- build/msw/makefile.gcc | 114 ++++++--- build/msw/makefile.vc | 111 ++++++--- build/msw/wx_stc.vcxproj | 48 ++-- build/msw/wx_wxscintilla.vcxproj | 150 ++++++------ build/msw/wx_wxscintilla.vcxproj.filters | 294 +++++++++++++---------- build/osx/wx.xcconfig | 2 +- src/stc/scintilla/README.txt | 8 +- 10 files changed, 574 insertions(+), 332 deletions(-) diff --git a/Makefile.in b/Makefile.in index c179838373..94d52e50b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -265,10 +265,10 @@ WXEXPAT_OBJECTS = \ WXSCINTILLA_CXXFLAGS = $(WX_CPPFLAGS) -DNDEBUG \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(__wxscintilla_usingdll_p) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(WX_CXXFLAGS) $(____SHARED) \ - $(CPPFLAGS) $(CXXFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__wxscintilla_usingdll_p) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) -DLPEG_LEXER=0 $(WX_CXXFLAGS) $(____SHARED) $(CPPFLAGS) \ + $(CXXFLAGS) WXSCINTILLA_OBJECTS = \ wxscintilla_LexA68k.o \ wxscintilla_LexAbaqus.o \ @@ -287,6 +287,7 @@ WXSCINTILLA_OBJECTS = \ wxscintilla_LexBibTeX.o \ wxscintilla_LexBullant.o \ wxscintilla_LexCaml.o \ + wxscintilla_LexCIL.o \ wxscintilla_LexCLW.o \ wxscintilla_LexCmake.o \ wxscintilla_LexCOBOL.o \ @@ -297,6 +298,7 @@ WXSCINTILLA_OBJECTS = \ wxscintilla_LexCsound.o \ wxscintilla_LexCSS.o \ wxscintilla_LexD.o \ + wxscintilla_LexDataflex.o \ wxscintilla_LexDiff.o \ wxscintilla_LexDMAP.o \ wxscintilla_LexDMIS.o \ @@ -312,8 +314,10 @@ WXSCINTILLA_OBJECTS = \ wxscintilla_LexGAP.o \ wxscintilla_LexGui4Cli.o \ wxscintilla_LexHaskell.o \ + wxscintilla_LexHollywood.o \ wxscintilla_LexHex.o \ wxscintilla_LexHTML.o \ + wxscintilla_LexIndent.o \ wxscintilla_LexInno.o \ wxscintilla_LexJSON.o \ wxscintilla_LexKix.o \ @@ -321,17 +325,20 @@ WXSCINTILLA_OBJECTS = \ wxscintilla_LexLaTeX.o \ wxscintilla_LexLisp.o \ wxscintilla_LexLout.o \ + wxscintilla_LexLPeg.o \ wxscintilla_LexLua.o \ wxscintilla_LexMagik.o \ wxscintilla_LexMake.o \ wxscintilla_LexMarkdown.o \ wxscintilla_LexMatlab.o \ + wxscintilla_LexMaxima.o \ wxscintilla_LexMetapost.o \ wxscintilla_LexMMIXAL.o \ wxscintilla_LexModula.o \ wxscintilla_LexMPT.o \ wxscintilla_LexMSSQL.o \ wxscintilla_LexMySQL.o \ + wxscintilla_LexNim.o \ wxscintilla_LexNimrod.o \ wxscintilla_LexNsis.o \ wxscintilla_LexNull.o \ @@ -350,10 +357,12 @@ WXSCINTILLA_OBJECTS = \ wxscintilla_LexPS.o \ wxscintilla_LexPython.o \ wxscintilla_LexR.o \ + wxscintilla_LexRaku.o \ wxscintilla_LexRebol.o \ wxscintilla_LexRegistry.o \ wxscintilla_LexRuby.o \ wxscintilla_LexRust.o \ + wxscintilla_LexSAS.o \ wxscintilla_LexScriptol.o \ wxscintilla_LexSmalltalk.o \ wxscintilla_LexSML.o \ @@ -361,6 +370,7 @@ WXSCINTILLA_OBJECTS = \ wxscintilla_LexSpecman.o \ wxscintilla_LexSpice.o \ wxscintilla_LexSQL.o \ + wxscintilla_LexStata.o \ wxscintilla_LexSTTXT.o \ wxscintilla_LexTACL.o \ wxscintilla_LexTADS3.o \ @@ -373,10 +383,12 @@ WXSCINTILLA_OBJECTS = \ wxscintilla_LexVerilog.o \ wxscintilla_LexVHDL.o \ wxscintilla_LexVisualProlog.o \ + wxscintilla_LexX12.o \ wxscintilla_LexYAML.o \ wxscintilla_Accessor.o \ wxscintilla_CharacterCategory.o \ wxscintilla_CharacterSet.o \ + wxscintilla_DefaultLexer.o \ wxscintilla_LexerBase.o \ wxscintilla_LexerModule.o \ wxscintilla_LexerNoExceptions.o \ @@ -392,11 +404,12 @@ WXSCINTILLA_OBJECTS = \ wxscintilla_CellBuffer.o \ wxscintilla_CharClassify.o \ wxscintilla_ContractionState.o \ + wxscintilla_DBCS.o \ wxscintilla_Decoration.o \ wxscintilla_Document.o \ wxscintilla_EditModel.o \ - wxscintilla_EditView.o \ wxscintilla_Editor.o \ + wxscintilla_EditView.o \ wxscintilla_ExternalLexer.o \ wxscintilla_Indicator.o \ wxscintilla_KeyMap.o \ @@ -410,6 +423,7 @@ WXSCINTILLA_OBJECTS = \ wxscintilla_Selection.o \ wxscintilla_Style.o \ wxscintilla_UniConversion.o \ + wxscintilla_UniqueString.o \ wxscintilla_ViewStyle.o \ wxscintilla_XPM.o PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0) @@ -988,10 +1002,9 @@ MONODLL_CFLAGS = $(__monodll_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(__webview_additional_include_wrl_p) \ - $(__webview_additional_include_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) \ - $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = $(__monodll_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \ $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @@ -999,10 +1012,10 @@ MONODLL_CXXFLAGS = $(__monodll_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(__webview_additional_include_wrl_p) \ - $(__webview_additional_include_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) \ - $(WX_CXXFLAGS) $(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(WX_CXXFLAGS) \ + $(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJCXXFLAGS = $(__monodll_PCH_INC) $(__INC_TIFF_BUILD_p) \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \ @@ -1010,10 +1023,9 @@ MONODLL_OBJCXXFLAGS = $(__monodll_PCH_INC) $(__INC_TIFF_BUILD_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(__webview_additional_include_wrl_p) \ - $(__webview_additional_include_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) \ - $(CPPFLAGS) $(OBJCXXFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) MONODLL_OBJECTS = \ monodll_any.o \ monodll_appbase.o \ @@ -1137,10 +1149,9 @@ MONOLIB_CFLAGS = $(__monolib_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(__webview_additional_include_wrl_p) \ - $(__webview_additional_include_p) -DwxUSE_BASE=1 $(WX_CFLAGS) $(CPPFLAGS) \ - $(CFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ + -DwxUSE_BASE=1 $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \ $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @@ -1148,10 +1159,10 @@ MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(__webview_additional_include_wrl_p) \ - $(__webview_additional_include_p) -DwxUSE_BASE=1 $(WX_CXXFLAGS) \ - $(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ + -DwxUSE_BASE=1 $(WX_CXXFLAGS) $(webview_edge_pragma_warning) $(CPPFLAGS) \ + $(CXXFLAGS) MONOLIB_OBJCXXFLAGS = $(__monolib_PCH_INC) $(__INC_TIFF_BUILD_p) \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \ @@ -1159,9 +1170,9 @@ MONOLIB_OBJCXXFLAGS = $(__monolib_PCH_INC) $(__INC_TIFF_BUILD_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(__webview_additional_include_wrl_p) \ - $(__webview_additional_include_p) -DwxUSE_BASE=1 $(CPPFLAGS) $(OBJCXXFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(OBJCXXFLAGS) MONOLIB_OBJECTS = \ monolib_any.o \ monolib_appbase.o \ @@ -2121,9 +2132,9 @@ STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) $(WX_CXXFLAGS) \ - $(CPPFLAGS) $(CXXFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) \ + $(CXXFLAGS) STCDLL_OBJCXXFLAGS = $(__stcdll_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \ $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @@ -2131,9 +2142,8 @@ STCDLL_OBJCXXFLAGS = $(__stcdll_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) $(CPPFLAGS) \ - $(OBJCXXFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) STCDLL_OBJECTS = \ $(__stcdll___win32rc) \ stcdll_stc.o \ @@ -2149,8 +2159,8 @@ STCLIB_CXXFLAGS = $(__stclib_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) STCLIB_OBJCXXFLAGS = $(__stclib_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \ $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @@ -2158,8 +2168,8 @@ STCLIB_OBJCXXFLAGS = $(__stclib_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \ $(__THREAD_DEFINE_p) -DWXBUILDING \ -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/lexlib \ - -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(CPPFLAGS) $(OBJCXXFLAGS) + -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(CPPFLAGS) $(OBJCXXFLAGS) STCLIB_OBJECTS = \ stclib_stc.o \ stclib_PlatWX.o \ @@ -14202,6 +14212,9 @@ wxscintilla_LexBullant.o: $(srcdir)/src/stc/scintilla/lexers/LexBullant.cxx wxscintilla_LexCaml.o: $(srcdir)/src/stc/scintilla/lexers/LexCaml.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexCaml.cxx +wxscintilla_LexCIL.o: $(srcdir)/src/stc/scintilla/lexers/LexCIL.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexCIL.cxx + wxscintilla_LexCLW.o: $(srcdir)/src/stc/scintilla/lexers/LexCLW.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexCLW.cxx @@ -14232,6 +14245,9 @@ wxscintilla_LexCSS.o: $(srcdir)/src/stc/scintilla/lexers/LexCSS.cxx wxscintilla_LexD.o: $(srcdir)/src/stc/scintilla/lexers/LexD.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexD.cxx +wxscintilla_LexDataflex.o: $(srcdir)/src/stc/scintilla/lexers/LexDataflex.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexDataflex.cxx + wxscintilla_LexDiff.o: $(srcdir)/src/stc/scintilla/lexers/LexDiff.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexDiff.cxx @@ -14277,12 +14293,18 @@ wxscintilla_LexGui4Cli.o: $(srcdir)/src/stc/scintilla/lexers/LexGui4Cli.cxx wxscintilla_LexHaskell.o: $(srcdir)/src/stc/scintilla/lexers/LexHaskell.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexHaskell.cxx +wxscintilla_LexHollywood.o: $(srcdir)/src/stc/scintilla/lexers/LexHollywood.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexHollywood.cxx + wxscintilla_LexHex.o: $(srcdir)/src/stc/scintilla/lexers/LexHex.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexHex.cxx wxscintilla_LexHTML.o: $(srcdir)/src/stc/scintilla/lexers/LexHTML.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexHTML.cxx +wxscintilla_LexIndent.o: $(srcdir)/src/stc/scintilla/lexers/LexIndent.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexIndent.cxx + wxscintilla_LexInno.o: $(srcdir)/src/stc/scintilla/lexers/LexInno.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexInno.cxx @@ -14304,6 +14326,9 @@ wxscintilla_LexLisp.o: $(srcdir)/src/stc/scintilla/lexers/LexLisp.cxx wxscintilla_LexLout.o: $(srcdir)/src/stc/scintilla/lexers/LexLout.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexLout.cxx +wxscintilla_LexLPeg.o: $(srcdir)/src/stc/scintilla/lexers/LexLPeg.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexLPeg.cxx + wxscintilla_LexLua.o: $(srcdir)/src/stc/scintilla/lexers/LexLua.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexLua.cxx @@ -14319,6 +14344,9 @@ wxscintilla_LexMarkdown.o: $(srcdir)/src/stc/scintilla/lexers/LexMarkdown.cxx wxscintilla_LexMatlab.o: $(srcdir)/src/stc/scintilla/lexers/LexMatlab.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexMatlab.cxx +wxscintilla_LexMaxima.o: $(srcdir)/src/stc/scintilla/lexers/LexMaxima.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexMaxima.cxx + wxscintilla_LexMetapost.o: $(srcdir)/src/stc/scintilla/lexers/LexMetapost.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexMetapost.cxx @@ -14337,6 +14365,9 @@ wxscintilla_LexMSSQL.o: $(srcdir)/src/stc/scintilla/lexers/LexMSSQL.cxx wxscintilla_LexMySQL.o: $(srcdir)/src/stc/scintilla/lexers/LexMySQL.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexMySQL.cxx +wxscintilla_LexNim.o: $(srcdir)/src/stc/scintilla/lexers/LexNim.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexNim.cxx + wxscintilla_LexNimrod.o: $(srcdir)/src/stc/scintilla/lexers/LexNimrod.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexNimrod.cxx @@ -14391,6 +14422,9 @@ wxscintilla_LexPython.o: $(srcdir)/src/stc/scintilla/lexers/LexPython.cxx wxscintilla_LexR.o: $(srcdir)/src/stc/scintilla/lexers/LexR.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexR.cxx +wxscintilla_LexRaku.o: $(srcdir)/src/stc/scintilla/lexers/LexRaku.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexRaku.cxx + wxscintilla_LexRebol.o: $(srcdir)/src/stc/scintilla/lexers/LexRebol.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexRebol.cxx @@ -14403,6 +14437,9 @@ wxscintilla_LexRuby.o: $(srcdir)/src/stc/scintilla/lexers/LexRuby.cxx wxscintilla_LexRust.o: $(srcdir)/src/stc/scintilla/lexers/LexRust.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexRust.cxx +wxscintilla_LexSAS.o: $(srcdir)/src/stc/scintilla/lexers/LexSAS.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexSAS.cxx + wxscintilla_LexScriptol.o: $(srcdir)/src/stc/scintilla/lexers/LexScriptol.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexScriptol.cxx @@ -14424,6 +14461,9 @@ wxscintilla_LexSpice.o: $(srcdir)/src/stc/scintilla/lexers/LexSpice.cxx wxscintilla_LexSQL.o: $(srcdir)/src/stc/scintilla/lexers/LexSQL.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexSQL.cxx +wxscintilla_LexStata.o: $(srcdir)/src/stc/scintilla/lexers/LexStata.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexStata.cxx + wxscintilla_LexSTTXT.o: $(srcdir)/src/stc/scintilla/lexers/LexSTTXT.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexSTTXT.cxx @@ -14460,6 +14500,9 @@ wxscintilla_LexVHDL.o: $(srcdir)/src/stc/scintilla/lexers/LexVHDL.cxx wxscintilla_LexVisualProlog.o: $(srcdir)/src/stc/scintilla/lexers/LexVisualProlog.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexVisualProlog.cxx +wxscintilla_LexX12.o: $(srcdir)/src/stc/scintilla/lexers/LexX12.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexX12.cxx + wxscintilla_LexYAML.o: $(srcdir)/src/stc/scintilla/lexers/LexYAML.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexYAML.cxx @@ -14472,6 +14515,9 @@ wxscintilla_CharacterCategory.o: $(srcdir)/src/stc/scintilla/lexlib/CharacterCat wxscintilla_CharacterSet.o: $(srcdir)/src/stc/scintilla/lexlib/CharacterSet.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexlib/CharacterSet.cxx +wxscintilla_DefaultLexer.o: $(srcdir)/src/stc/scintilla/lexlib/DefaultLexer.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexlib/DefaultLexer.cxx + wxscintilla_LexerBase.o: $(srcdir)/src/stc/scintilla/lexlib/LexerBase.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexlib/LexerBase.cxx @@ -14517,6 +14563,9 @@ wxscintilla_CharClassify.o: $(srcdir)/src/stc/scintilla/src/CharClassify.cxx wxscintilla_ContractionState.o: $(srcdir)/src/stc/scintilla/src/ContractionState.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/ContractionState.cxx +wxscintilla_DBCS.o: $(srcdir)/src/stc/scintilla/src/DBCS.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/DBCS.cxx + wxscintilla_Decoration.o: $(srcdir)/src/stc/scintilla/src/Decoration.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/Decoration.cxx @@ -14526,12 +14575,12 @@ wxscintilla_Document.o: $(srcdir)/src/stc/scintilla/src/Document.cxx wxscintilla_EditModel.o: $(srcdir)/src/stc/scintilla/src/EditModel.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/EditModel.cxx -wxscintilla_EditView.o: $(srcdir)/src/stc/scintilla/src/EditView.cxx - $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/EditView.cxx - wxscintilla_Editor.o: $(srcdir)/src/stc/scintilla/src/Editor.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/Editor.cxx +wxscintilla_EditView.o: $(srcdir)/src/stc/scintilla/src/EditView.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/EditView.cxx + wxscintilla_ExternalLexer.o: $(srcdir)/src/stc/scintilla/src/ExternalLexer.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/ExternalLexer.cxx @@ -14571,6 +14620,9 @@ wxscintilla_Style.o: $(srcdir)/src/stc/scintilla/src/Style.cxx wxscintilla_UniConversion.o: $(srcdir)/src/stc/scintilla/src/UniConversion.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/UniConversion.cxx +wxscintilla_UniqueString.o: $(srcdir)/src/stc/scintilla/src/UniqueString.cxx + $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/UniqueString.cxx + wxscintilla_ViewStyle.o: $(srcdir)/src/stc/scintilla/src/ViewStyle.cxx $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/ViewStyle.cxx @@ -19333,7 +19385,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) - $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS $(__webview_additional_include_wrl_p_0) $(__webview_additional_include_p_0) --define wxUSE_BASE=1 --define WXMAKINGDLL + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS $(__webview_additional_include_wrl_p_0) $(__webview_additional_include_p_0) --define wxUSE_BASE=1 --define WXMAKINGDLL monolib_any.o: $(srcdir)/src/common/any.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/any.cpp @@ -33673,7 +33725,7 @@ richtextlib_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(RICHTEXTLIB_ODEP) $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP) - $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC + $(WINDRES) -i$< -o$@ $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP) $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl index 76f7d269cd..13f991e58d 100644 --- a/build/bakefiles/scintilla.bkl +++ b/build/bakefiles/scintilla.bkl @@ -35,7 +35,6 @@ $(TOP_SRCDIR)src/stc/scintilla/src __WX__ SCI_LEXER - NO_CXX11_REGEX LINK_LEXERS -w-8027 @@ -55,6 +54,7 @@ $(WXUNIV_DEFINE) $(DEBUG_DEFINE) $(UNICODE_DEFINE) + LPEG_LEXER=0 $(LIBDIRNAME) src/stc/scintilla/lexers/LexA68k.cxx @@ -74,6 +74,7 @@ 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 @@ -84,6 +85,7 @@ 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 @@ -100,7 +102,9 @@ 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 @@ -108,17 +112,20 @@ 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 @@ -137,10 +144,12 @@ 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 @@ -148,6 +157,7 @@ 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 @@ -160,10 +170,12 @@ 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 @@ -179,11 +191,12 @@ src/stc/scintilla/src/CellBuffer.cxx src/stc/scintilla/src/CharClassify.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/EditView.cxx src/stc/scintilla/src/Editor.cxx + src/stc/scintilla/src/EditView.cxx src/stc/scintilla/src/ExternalLexer.cxx src/stc/scintilla/src/Indicator.cxx src/stc/scintilla/src/KeyMap.cxx @@ -197,6 +210,7 @@ src/stc/scintilla/src/Selection.cxx src/stc/scintilla/src/Style.cxx src/stc/scintilla/src/UniConversion.cxx + src/stc/scintilla/src/UniqueString.cxx src/stc/scintilla/src/ViewStyle.cxx src/stc/scintilla/src/XPM.cxx diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt index 1116186833..5ed8f00d99 100644 --- a/build/cmake/lib/stc/CMakeLists.txt +++ b/build/cmake/lib/stc/CMakeLists.txt @@ -31,6 +31,7 @@ wx_add_builtin_library(wxscintilla 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 @@ -41,6 +42,7 @@ wx_add_builtin_library(wxscintilla 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 @@ -57,7 +59,9 @@ wx_add_builtin_library(wxscintilla 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 @@ -65,17 +69,20 @@ wx_add_builtin_library(wxscintilla 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 @@ -94,10 +101,12 @@ wx_add_builtin_library(wxscintilla 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 @@ -105,6 +114,7 @@ wx_add_builtin_library(wxscintilla 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 @@ -117,10 +127,12 @@ wx_add_builtin_library(wxscintilla 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 @@ -136,11 +148,12 @@ wx_add_builtin_library(wxscintilla src/stc/scintilla/src/CellBuffer.cxx src/stc/scintilla/src/CharClassify.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/EditView.cxx src/stc/scintilla/src/Editor.cxx + src/stc/scintilla/src/EditView.cxx src/stc/scintilla/src/ExternalLexer.cxx src/stc/scintilla/src/Indicator.cxx src/stc/scintilla/src/KeyMap.cxx @@ -154,6 +167,7 @@ wx_add_builtin_library(wxscintilla src/stc/scintilla/src/Selection.cxx src/stc/scintilla/src/Style.cxx src/stc/scintilla/src/UniConversion.cxx + src/stc/scintilla/src/UniqueString.cxx src/stc/scintilla/src/ViewStyle.cxx src/stc/scintilla/src/XPM.cxx ) @@ -161,12 +175,12 @@ target_include_directories(wxscintilla PRIVATE ${wxSOURCE_DIR}/src/stc/scintilla/include ${wxSOURCE_DIR}/src/stc/scintilla/lexlib ${wxSOURCE_DIR}/src/stc/scintilla/src - ) +) target_compile_definitions(wxscintilla PRIVATE - NO_CXX11_REGEX __WX__ SCI_LEXER LINK_LEXERS + LPEG_LEXER=0 ) wx_target_enable_precomp(wxscintilla "${wxSOURCE_DIR}/src/stc/scintilla/include/Scintilla.h") @@ -175,9 +189,8 @@ wx_lib_include_directories(wxstc ${wxSOURCE_DIR}/src/stc/scintilla/include ${wxSOURCE_DIR}/src/stc/scintilla/lexlib ${wxSOURCE_DIR}/src/stc/scintilla/src - ) +) wx_lib_compile_definitions(wxstc - NO_CXX11_REGEX __WX__ SCI_LEXER LINK_LEXERS diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 9545062c21..bfde35b675 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -218,10 +218,10 @@ WXEXPAT_OBJECTS = \ WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ -DNDEBUG -I..\..\src\stc\scintilla\include \ -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DNO_CXX11_REGEX -DLINK_LEXERS -I$(SETUPHDIR) -I..\..\include \ + -DSCI_LEXER -DLINK_LEXERS -I$(SETUPHDIR) -I..\..\include \ $(__wxscintilla_usingdll_p) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -DLPEG_LEXER=0 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexA68k.o \ $(OBJS)\wxscintilla_LexAbaqus.o \ @@ -240,6 +240,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexBibTeX.o \ $(OBJS)\wxscintilla_LexBullant.o \ $(OBJS)\wxscintilla_LexCaml.o \ + $(OBJS)\wxscintilla_LexCIL.o \ $(OBJS)\wxscintilla_LexCLW.o \ $(OBJS)\wxscintilla_LexCmake.o \ $(OBJS)\wxscintilla_LexCOBOL.o \ @@ -250,6 +251,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexCsound.o \ $(OBJS)\wxscintilla_LexCSS.o \ $(OBJS)\wxscintilla_LexD.o \ + $(OBJS)\wxscintilla_LexDataflex.o \ $(OBJS)\wxscintilla_LexDiff.o \ $(OBJS)\wxscintilla_LexDMAP.o \ $(OBJS)\wxscintilla_LexDMIS.o \ @@ -265,8 +267,10 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexGAP.o \ $(OBJS)\wxscintilla_LexGui4Cli.o \ $(OBJS)\wxscintilla_LexHaskell.o \ + $(OBJS)\wxscintilla_LexHollywood.o \ $(OBJS)\wxscintilla_LexHex.o \ $(OBJS)\wxscintilla_LexHTML.o \ + $(OBJS)\wxscintilla_LexIndent.o \ $(OBJS)\wxscintilla_LexInno.o \ $(OBJS)\wxscintilla_LexJSON.o \ $(OBJS)\wxscintilla_LexKix.o \ @@ -274,17 +278,20 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexLaTeX.o \ $(OBJS)\wxscintilla_LexLisp.o \ $(OBJS)\wxscintilla_LexLout.o \ + $(OBJS)\wxscintilla_LexLPeg.o \ $(OBJS)\wxscintilla_LexLua.o \ $(OBJS)\wxscintilla_LexMagik.o \ $(OBJS)\wxscintilla_LexMake.o \ $(OBJS)\wxscintilla_LexMarkdown.o \ $(OBJS)\wxscintilla_LexMatlab.o \ + $(OBJS)\wxscintilla_LexMaxima.o \ $(OBJS)\wxscintilla_LexMetapost.o \ $(OBJS)\wxscintilla_LexMMIXAL.o \ $(OBJS)\wxscintilla_LexModula.o \ $(OBJS)\wxscintilla_LexMPT.o \ $(OBJS)\wxscintilla_LexMSSQL.o \ $(OBJS)\wxscintilla_LexMySQL.o \ + $(OBJS)\wxscintilla_LexNim.o \ $(OBJS)\wxscintilla_LexNimrod.o \ $(OBJS)\wxscintilla_LexNsis.o \ $(OBJS)\wxscintilla_LexNull.o \ @@ -303,10 +310,12 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexPS.o \ $(OBJS)\wxscintilla_LexPython.o \ $(OBJS)\wxscintilla_LexR.o \ + $(OBJS)\wxscintilla_LexRaku.o \ $(OBJS)\wxscintilla_LexRebol.o \ $(OBJS)\wxscintilla_LexRegistry.o \ $(OBJS)\wxscintilla_LexRuby.o \ $(OBJS)\wxscintilla_LexRust.o \ + $(OBJS)\wxscintilla_LexSAS.o \ $(OBJS)\wxscintilla_LexScriptol.o \ $(OBJS)\wxscintilla_LexSmalltalk.o \ $(OBJS)\wxscintilla_LexSML.o \ @@ -314,6 +323,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexSpecman.o \ $(OBJS)\wxscintilla_LexSpice.o \ $(OBJS)\wxscintilla_LexSQL.o \ + $(OBJS)\wxscintilla_LexStata.o \ $(OBJS)\wxscintilla_LexSTTXT.o \ $(OBJS)\wxscintilla_LexTACL.o \ $(OBJS)\wxscintilla_LexTADS3.o \ @@ -326,10 +336,12 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexVerilog.o \ $(OBJS)\wxscintilla_LexVHDL.o \ $(OBJS)\wxscintilla_LexVisualProlog.o \ + $(OBJS)\wxscintilla_LexX12.o \ $(OBJS)\wxscintilla_LexYAML.o \ $(OBJS)\wxscintilla_Accessor.o \ $(OBJS)\wxscintilla_CharacterCategory.o \ $(OBJS)\wxscintilla_CharacterSet.o \ + $(OBJS)\wxscintilla_DefaultLexer.o \ $(OBJS)\wxscintilla_LexerBase.o \ $(OBJS)\wxscintilla_LexerModule.o \ $(OBJS)\wxscintilla_LexerNoExceptions.o \ @@ -345,11 +357,12 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_CellBuffer.o \ $(OBJS)\wxscintilla_CharClassify.o \ $(OBJS)\wxscintilla_ContractionState.o \ + $(OBJS)\wxscintilla_DBCS.o \ $(OBJS)\wxscintilla_Decoration.o \ $(OBJS)\wxscintilla_Document.o \ $(OBJS)\wxscintilla_EditModel.o \ - $(OBJS)\wxscintilla_EditView.o \ $(OBJS)\wxscintilla_Editor.o \ + $(OBJS)\wxscintilla_EditView.o \ $(OBJS)\wxscintilla_ExternalLexer.o \ $(OBJS)\wxscintilla_Indicator.o \ $(OBJS)\wxscintilla_KeyMap.o \ @@ -363,6 +376,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_Selection.o \ $(OBJS)\wxscintilla_Style.o \ $(OBJS)\wxscintilla_UniConversion.o \ + $(OBJS)\wxscintilla_UniqueString.o \ $(OBJS)\wxscintilla_ViewStyle.o \ $(OBJS)\wxscintilla_XPM.o MONODLL_CFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ @@ -373,10 +387,9 @@ MONODLL_CFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS -I..\..\include\wx\msw\wrl \ - -I..\..\3rdparty\webview2\build\native\include -DwxUSE_BASE=1 \ - -DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -I..\..\include\wx\msw\wrl -I..\..\3rdparty\webview2\build\native\include \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ -I..\..\src\zlib -I..\..\3rdparty\pcre\src\wx -I..\..\src\expat\expat\lib \ $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ \ @@ -385,11 +398,10 @@ MONODLL_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS -I..\..\include\wx\msw\wrl \ - -I..\..\3rdparty\webview2\build\native\include -DwxUSE_BASE=1 \ - -DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - -Wno-unknown-pragmas $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -I..\..\include\wx\msw\wrl -I..\..\3rdparty\webview2\build\native\include \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy -Wno-unknown-pragmas $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.o \ $(OBJS)\monodll_any.o \ @@ -535,10 +547,9 @@ MONOLIB_CFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS -I..\..\include\wx\msw\wrl \ - -I..\..\3rdparty\webview2\build\native\include -DwxUSE_BASE=1 $(CPPFLAGS) \ - $(CFLAGS) + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -I..\..\include\wx\msw\wrl -I..\..\3rdparty\webview2\build\native\include \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ -I..\..\src\zlib -I..\..\3rdparty\pcre\src\wx -I..\..\src\expat\expat\lib \ $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ \ @@ -547,10 +558,9 @@ MONOLIB_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS -I..\..\include\wx\msw\wrl \ - -I..\..\3rdparty\webview2\build\native\include -DwxUSE_BASE=1 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -I..\..\include\wx\msw\wrl -I..\..\3rdparty\webview2\build\native\include \ + -DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ -Wno-unknown-pragmas $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.o \ @@ -1595,9 +1605,9 @@ STCDLL_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -DWXUSINGDLL -DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ $(OBJS)\stcdll_dummy.o \ $(OBJS)\stcdll_version_rc.o \ @@ -1613,9 +1623,9 @@ STCLIB_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \ - -DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) STCLIB_OBJECTS = \ $(OBJS)\stclib_dummy.o \ $(OBJS)\stclib_stc.o \ @@ -6537,6 +6547,9 @@ $(OBJS)\wxscintilla_LexBullant.o: ../../src/stc/scintilla/lexers/LexBullant.cxx $(OBJS)\wxscintilla_LexCaml.o: ../../src/stc/scintilla/lexers/LexCaml.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexCIL.o: ../../src/stc/scintilla/lexers/LexCIL.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexCLW.o: ../../src/stc/scintilla/lexers/LexCLW.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6567,6 +6580,9 @@ $(OBJS)\wxscintilla_LexCSS.o: ../../src/stc/scintilla/lexers/LexCSS.cxx $(OBJS)\wxscintilla_LexD.o: ../../src/stc/scintilla/lexers/LexD.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexDataflex.o: ../../src/stc/scintilla/lexers/LexDataflex.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexDiff.o: ../../src/stc/scintilla/lexers/LexDiff.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6612,12 +6628,18 @@ $(OBJS)\wxscintilla_LexGui4Cli.o: ../../src/stc/scintilla/lexers/LexGui4Cli.cxx $(OBJS)\wxscintilla_LexHaskell.o: ../../src/stc/scintilla/lexers/LexHaskell.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexHollywood.o: ../../src/stc/scintilla/lexers/LexHollywood.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexHex.o: ../../src/stc/scintilla/lexers/LexHex.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\wxscintilla_LexHTML.o: ../../src/stc/scintilla/lexers/LexHTML.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexIndent.o: ../../src/stc/scintilla/lexers/LexIndent.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexInno.o: ../../src/stc/scintilla/lexers/LexInno.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6639,6 +6661,9 @@ $(OBJS)\wxscintilla_LexLisp.o: ../../src/stc/scintilla/lexers/LexLisp.cxx $(OBJS)\wxscintilla_LexLout.o: ../../src/stc/scintilla/lexers/LexLout.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexLPeg.o: ../../src/stc/scintilla/lexers/LexLPeg.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexLua.o: ../../src/stc/scintilla/lexers/LexLua.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6654,6 +6679,9 @@ $(OBJS)\wxscintilla_LexMarkdown.o: ../../src/stc/scintilla/lexers/LexMarkdown.cx $(OBJS)\wxscintilla_LexMatlab.o: ../../src/stc/scintilla/lexers/LexMatlab.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexMaxima.o: ../../src/stc/scintilla/lexers/LexMaxima.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexMetapost.o: ../../src/stc/scintilla/lexers/LexMetapost.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6672,6 +6700,9 @@ $(OBJS)\wxscintilla_LexMSSQL.o: ../../src/stc/scintilla/lexers/LexMSSQL.cxx $(OBJS)\wxscintilla_LexMySQL.o: ../../src/stc/scintilla/lexers/LexMySQL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexNim.o: ../../src/stc/scintilla/lexers/LexNim.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexNimrod.o: ../../src/stc/scintilla/lexers/LexNimrod.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6726,6 +6757,9 @@ $(OBJS)\wxscintilla_LexPython.o: ../../src/stc/scintilla/lexers/LexPython.cxx $(OBJS)\wxscintilla_LexR.o: ../../src/stc/scintilla/lexers/LexR.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexRaku.o: ../../src/stc/scintilla/lexers/LexRaku.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexRebol.o: ../../src/stc/scintilla/lexers/LexRebol.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6738,6 +6772,9 @@ $(OBJS)\wxscintilla_LexRuby.o: ../../src/stc/scintilla/lexers/LexRuby.cxx $(OBJS)\wxscintilla_LexRust.o: ../../src/stc/scintilla/lexers/LexRust.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexSAS.o: ../../src/stc/scintilla/lexers/LexSAS.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexScriptol.o: ../../src/stc/scintilla/lexers/LexScriptol.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6759,6 +6796,9 @@ $(OBJS)\wxscintilla_LexSpice.o: ../../src/stc/scintilla/lexers/LexSpice.cxx $(OBJS)\wxscintilla_LexSQL.o: ../../src/stc/scintilla/lexers/LexSQL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexStata.o: ../../src/stc/scintilla/lexers/LexStata.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexSTTXT.o: ../../src/stc/scintilla/lexers/LexSTTXT.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6795,6 +6835,9 @@ $(OBJS)\wxscintilla_LexVHDL.o: ../../src/stc/scintilla/lexers/LexVHDL.cxx $(OBJS)\wxscintilla_LexVisualProlog.o: ../../src/stc/scintilla/lexers/LexVisualProlog.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexX12.o: ../../src/stc/scintilla/lexers/LexX12.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexYAML.o: ../../src/stc/scintilla/lexers/LexYAML.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6807,6 +6850,9 @@ $(OBJS)\wxscintilla_CharacterCategory.o: ../../src/stc/scintilla/lexlib/Characte $(OBJS)\wxscintilla_CharacterSet.o: ../../src/stc/scintilla/lexlib/CharacterSet.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_DefaultLexer.o: ../../src/stc/scintilla/lexlib/DefaultLexer.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexerBase.o: ../../src/stc/scintilla/lexlib/LexerBase.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6852,6 +6898,9 @@ $(OBJS)\wxscintilla_CharClassify.o: ../../src/stc/scintilla/src/CharClassify.cxx $(OBJS)\wxscintilla_ContractionState.o: ../../src/stc/scintilla/src/ContractionState.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_DBCS.o: ../../src/stc/scintilla/src/DBCS.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_Decoration.o: ../../src/stc/scintilla/src/Decoration.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6861,10 +6910,10 @@ $(OBJS)\wxscintilla_Document.o: ../../src/stc/scintilla/src/Document.cxx $(OBJS)\wxscintilla_EditModel.o: ../../src/stc/scintilla/src/EditModel.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_EditView.o: ../../src/stc/scintilla/src/EditView.cxx +$(OBJS)\wxscintilla_Editor.o: ../../src/stc/scintilla/src/Editor.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_Editor.o: ../../src/stc/scintilla/src/Editor.cxx +$(OBJS)\wxscintilla_EditView.o: ../../src/stc/scintilla/src/EditView.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\wxscintilla_ExternalLexer.o: ../../src/stc/scintilla/src/ExternalLexer.cxx @@ -6906,6 +6955,9 @@ $(OBJS)\wxscintilla_Style.o: ../../src/stc/scintilla/src/Style.cxx $(OBJS)\wxscintilla_UniConversion.o: ../../src/stc/scintilla/src/UniConversion.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_UniqueString.o: ../../src/stc/scintilla/src/UniqueString.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_ViewStyle.o: ../../src/stc/scintilla/src/ViewStyle.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -9500,7 +9552,7 @@ $(OBJS)\monodll_bmpsvg.o: ../../src/generic/bmpsvg.cpp endif $(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../3rdparty/pcre/src/wx --include-dir ../../src/expat/expat/lib --define __WXMSW__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS --include-dir ../../include/wx/msw/wrl --include-dir ../../3rdparty/webview2/build/native/include --define wxUSE_BASE=1 --define WXMAKINGDLL + $(WINDRES) -i$< -o$@ --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../3rdparty/pcre/src/wx --include-dir ../../src/expat/expat/lib --define __WXMSW__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --include-dir ../../include/wx/msw/wrl --include-dir ../../3rdparty/webview2/build/native/include --define wxUSE_BASE=1 --define WXMAKINGDLL $(OBJS)\monolib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -17399,7 +17451,7 @@ $(OBJS)\stcdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\stcdll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../3rdparty/pcre/src/wx --include-dir ../../src/expat/expat/lib --define __WXMSW__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC + $(WINDRES) -i$< -o$@ --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../3rdparty/pcre/src/wx --include-dir ../../src/expat/expat/lib --define __WXMSW__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC $(OBJS)\stcdll_stc.o: ../../src/stc/stc.cpp $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 8ab7391e7f..abd5d1dce8 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -243,10 +243,10 @@ WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \ $(__NO_VC_CRTDBG_p) $(__TARGET_CPU_COMPFLAG_p) /DNDEBUG \ /D_CRT_SECURE_NO_WARNINGS /I..\..\src\stc\scintilla\include \ /I..\..\src\stc\scintilla\lexlib /I..\..\src\stc\scintilla\src /D__WX__ \ - /DSCI_LEXER /DNO_CXX11_REGEX /DLINK_LEXERS /I$(SETUPHDIR) /I..\..\include \ + /DSCI_LEXER /DLINK_LEXERS /I$(SETUPHDIR) /I..\..\include \ $(__wxscintilla_usingdll_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /DLPEG_LEXER=0 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexA68k.obj \ $(OBJS)\wxscintilla_LexAbaqus.obj \ @@ -265,6 +265,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexBibTeX.obj \ $(OBJS)\wxscintilla_LexBullant.obj \ $(OBJS)\wxscintilla_LexCaml.obj \ + $(OBJS)\wxscintilla_LexCIL.obj \ $(OBJS)\wxscintilla_LexCLW.obj \ $(OBJS)\wxscintilla_LexCmake.obj \ $(OBJS)\wxscintilla_LexCOBOL.obj \ @@ -275,6 +276,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexCsound.obj \ $(OBJS)\wxscintilla_LexCSS.obj \ $(OBJS)\wxscintilla_LexD.obj \ + $(OBJS)\wxscintilla_LexDataflex.obj \ $(OBJS)\wxscintilla_LexDiff.obj \ $(OBJS)\wxscintilla_LexDMAP.obj \ $(OBJS)\wxscintilla_LexDMIS.obj \ @@ -290,8 +292,10 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexGAP.obj \ $(OBJS)\wxscintilla_LexGui4Cli.obj \ $(OBJS)\wxscintilla_LexHaskell.obj \ + $(OBJS)\wxscintilla_LexHollywood.obj \ $(OBJS)\wxscintilla_LexHex.obj \ $(OBJS)\wxscintilla_LexHTML.obj \ + $(OBJS)\wxscintilla_LexIndent.obj \ $(OBJS)\wxscintilla_LexInno.obj \ $(OBJS)\wxscintilla_LexJSON.obj \ $(OBJS)\wxscintilla_LexKix.obj \ @@ -299,17 +303,20 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexLaTeX.obj \ $(OBJS)\wxscintilla_LexLisp.obj \ $(OBJS)\wxscintilla_LexLout.obj \ + $(OBJS)\wxscintilla_LexLPeg.obj \ $(OBJS)\wxscintilla_LexLua.obj \ $(OBJS)\wxscintilla_LexMagik.obj \ $(OBJS)\wxscintilla_LexMake.obj \ $(OBJS)\wxscintilla_LexMarkdown.obj \ $(OBJS)\wxscintilla_LexMatlab.obj \ + $(OBJS)\wxscintilla_LexMaxima.obj \ $(OBJS)\wxscintilla_LexMetapost.obj \ $(OBJS)\wxscintilla_LexMMIXAL.obj \ $(OBJS)\wxscintilla_LexModula.obj \ $(OBJS)\wxscintilla_LexMPT.obj \ $(OBJS)\wxscintilla_LexMSSQL.obj \ $(OBJS)\wxscintilla_LexMySQL.obj \ + $(OBJS)\wxscintilla_LexNim.obj \ $(OBJS)\wxscintilla_LexNimrod.obj \ $(OBJS)\wxscintilla_LexNsis.obj \ $(OBJS)\wxscintilla_LexNull.obj \ @@ -328,10 +335,12 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexPS.obj \ $(OBJS)\wxscintilla_LexPython.obj \ $(OBJS)\wxscintilla_LexR.obj \ + $(OBJS)\wxscintilla_LexRaku.obj \ $(OBJS)\wxscintilla_LexRebol.obj \ $(OBJS)\wxscintilla_LexRegistry.obj \ $(OBJS)\wxscintilla_LexRuby.obj \ $(OBJS)\wxscintilla_LexRust.obj \ + $(OBJS)\wxscintilla_LexSAS.obj \ $(OBJS)\wxscintilla_LexScriptol.obj \ $(OBJS)\wxscintilla_LexSmalltalk.obj \ $(OBJS)\wxscintilla_LexSML.obj \ @@ -339,6 +348,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexSpecman.obj \ $(OBJS)\wxscintilla_LexSpice.obj \ $(OBJS)\wxscintilla_LexSQL.obj \ + $(OBJS)\wxscintilla_LexStata.obj \ $(OBJS)\wxscintilla_LexSTTXT.obj \ $(OBJS)\wxscintilla_LexTACL.obj \ $(OBJS)\wxscintilla_LexTADS3.obj \ @@ -351,10 +361,12 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexVerilog.obj \ $(OBJS)\wxscintilla_LexVHDL.obj \ $(OBJS)\wxscintilla_LexVisualProlog.obj \ + $(OBJS)\wxscintilla_LexX12.obj \ $(OBJS)\wxscintilla_LexYAML.obj \ $(OBJS)\wxscintilla_Accessor.obj \ $(OBJS)\wxscintilla_CharacterCategory.obj \ $(OBJS)\wxscintilla_CharacterSet.obj \ + $(OBJS)\wxscintilla_DefaultLexer.obj \ $(OBJS)\wxscintilla_LexerBase.obj \ $(OBJS)\wxscintilla_LexerModule.obj \ $(OBJS)\wxscintilla_LexerNoExceptions.obj \ @@ -370,11 +382,12 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_CellBuffer.obj \ $(OBJS)\wxscintilla_CharClassify.obj \ $(OBJS)\wxscintilla_ContractionState.obj \ + $(OBJS)\wxscintilla_DBCS.obj \ $(OBJS)\wxscintilla_Decoration.obj \ $(OBJS)\wxscintilla_Document.obj \ $(OBJS)\wxscintilla_EditModel.obj \ - $(OBJS)\wxscintilla_EditView.obj \ $(OBJS)\wxscintilla_Editor.obj \ + $(OBJS)\wxscintilla_EditView.obj \ $(OBJS)\wxscintilla_ExternalLexer.obj \ $(OBJS)\wxscintilla_Indicator.obj \ $(OBJS)\wxscintilla_KeyMap.obj \ @@ -388,6 +401,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_Selection.obj \ $(OBJS)\wxscintilla_Style.obj \ $(OBJS)\wxscintilla_UniConversion.obj \ + $(OBJS)\wxscintilla_UniqueString.obj \ $(OBJS)\wxscintilla_ViewStyle.obj \ $(OBJS)\wxscintilla_XPM.obj MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ @@ -402,9 +416,9 @@ MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING \ /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DNO_CXX11_REGEX \ - /DLINK_LEXERS /I..\..\3rdparty\webview2\build\native\include \ - /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + /I..\..\3rdparty\webview2\build\native\include /DwxUSE_BASE=1 \ + /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \ /I..\..\3rdparty\pcre\src\wx /I..\..\src\expat\expat\lib $(__DEBUGINFO) \ @@ -417,10 +431,10 @@ MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING \ /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DNO_CXX11_REGEX \ - /DLINK_LEXERS /I..\..\3rdparty\webview2\build\native\include \ - /DwxUSE_BASE=1 /DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS) + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + /I..\..\3rdparty\webview2\build\native\include /DwxUSE_BASE=1 \ + /DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ $(OBJS)\monodll_any.obj \ @@ -571,9 +585,9 @@ MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \ $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING \ /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DNO_CXX11_REGEX \ - /DLINK_LEXERS /I..\..\3rdparty\webview2\build\native\include \ - /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + /I..\..\3rdparty\webview2\build\native\include /DwxUSE_BASE=1 $(CPPFLAGS) \ + $(CFLAGS) MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \ /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \ /I..\..\3rdparty\pcre\src\wx /I..\..\src\expat\expat\lib $(__DEBUGINFO) \ @@ -586,9 +600,9 @@ MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \ $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING \ /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DNO_CXX11_REGEX \ - /DLINK_LEXERS /I..\..\3rdparty\webview2\build\native\include \ - /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + /I..\..\3rdparty\webview2\build\native\include /DwxUSE_BASE=1 \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ @@ -1788,10 +1802,9 @@ STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \ $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING \ /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DNO_CXX11_REGEX \ - /DLINK_LEXERS /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ $(OBJS)\stcdll_dummy.obj \ $(OBJS)\stcdll_stc.obj \ @@ -1812,8 +1825,8 @@ STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \ $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /DWXBUILDING \ /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DNO_CXX11_REGEX \ - /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_stclib.pch" $(CPPFLAGS) $(CXXFLAGS) STCLIB_OBJECTS = \ $(OBJS)\stclib_dummy.obj \ @@ -6992,6 +7005,9 @@ $(OBJS)\wxscintilla_LexBullant.obj: ..\..\src\stc\scintilla\lexers\LexBullant.cx $(OBJS)\wxscintilla_LexCaml.obj: ..\..\src\stc\scintilla\lexers\LexCaml.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCaml.cxx +$(OBJS)\wxscintilla_LexCIL.obj: ..\..\src\stc\scintilla\lexers\LexCIL.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCIL.cxx + $(OBJS)\wxscintilla_LexCLW.obj: ..\..\src\stc\scintilla\lexers\LexCLW.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCLW.cxx @@ -7022,6 +7038,9 @@ $(OBJS)\wxscintilla_LexCSS.obj: ..\..\src\stc\scintilla\lexers\LexCSS.cxx $(OBJS)\wxscintilla_LexD.obj: ..\..\src\stc\scintilla\lexers\LexD.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexD.cxx +$(OBJS)\wxscintilla_LexDataflex.obj: ..\..\src\stc\scintilla\lexers\LexDataflex.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexDataflex.cxx + $(OBJS)\wxscintilla_LexDiff.obj: ..\..\src\stc\scintilla\lexers\LexDiff.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexDiff.cxx @@ -7067,12 +7086,18 @@ $(OBJS)\wxscintilla_LexGui4Cli.obj: ..\..\src\stc\scintilla\lexers\LexGui4Cli.cx $(OBJS)\wxscintilla_LexHaskell.obj: ..\..\src\stc\scintilla\lexers\LexHaskell.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHaskell.cxx +$(OBJS)\wxscintilla_LexHollywood.obj: ..\..\src\stc\scintilla\lexers\LexHollywood.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHollywood.cxx + $(OBJS)\wxscintilla_LexHex.obj: ..\..\src\stc\scintilla\lexers\LexHex.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHex.cxx $(OBJS)\wxscintilla_LexHTML.obj: ..\..\src\stc\scintilla\lexers\LexHTML.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHTML.cxx +$(OBJS)\wxscintilla_LexIndent.obj: ..\..\src\stc\scintilla\lexers\LexIndent.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexIndent.cxx + $(OBJS)\wxscintilla_LexInno.obj: ..\..\src\stc\scintilla\lexers\LexInno.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexInno.cxx @@ -7094,6 +7119,9 @@ $(OBJS)\wxscintilla_LexLisp.obj: ..\..\src\stc\scintilla\lexers\LexLisp.cxx $(OBJS)\wxscintilla_LexLout.obj: ..\..\src\stc\scintilla\lexers\LexLout.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLout.cxx +$(OBJS)\wxscintilla_LexLPeg.obj: ..\..\src\stc\scintilla\lexers\LexLPeg.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLPeg.cxx + $(OBJS)\wxscintilla_LexLua.obj: ..\..\src\stc\scintilla\lexers\LexLua.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLua.cxx @@ -7109,6 +7137,9 @@ $(OBJS)\wxscintilla_LexMarkdown.obj: ..\..\src\stc\scintilla\lexers\LexMarkdown. $(OBJS)\wxscintilla_LexMatlab.obj: ..\..\src\stc\scintilla\lexers\LexMatlab.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMatlab.cxx +$(OBJS)\wxscintilla_LexMaxima.obj: ..\..\src\stc\scintilla\lexers\LexMaxima.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMaxima.cxx + $(OBJS)\wxscintilla_LexMetapost.obj: ..\..\src\stc\scintilla\lexers\LexMetapost.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMetapost.cxx @@ -7127,6 +7158,9 @@ $(OBJS)\wxscintilla_LexMSSQL.obj: ..\..\src\stc\scintilla\lexers\LexMSSQL.cxx $(OBJS)\wxscintilla_LexMySQL.obj: ..\..\src\stc\scintilla\lexers\LexMySQL.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMySQL.cxx +$(OBJS)\wxscintilla_LexNim.obj: ..\..\src\stc\scintilla\lexers\LexNim.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNim.cxx + $(OBJS)\wxscintilla_LexNimrod.obj: ..\..\src\stc\scintilla\lexers\LexNimrod.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNimrod.cxx @@ -7181,6 +7215,9 @@ $(OBJS)\wxscintilla_LexPython.obj: ..\..\src\stc\scintilla\lexers\LexPython.cxx $(OBJS)\wxscintilla_LexR.obj: ..\..\src\stc\scintilla\lexers\LexR.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexR.cxx +$(OBJS)\wxscintilla_LexRaku.obj: ..\..\src\stc\scintilla\lexers\LexRaku.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexRaku.cxx + $(OBJS)\wxscintilla_LexRebol.obj: ..\..\src\stc\scintilla\lexers\LexRebol.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexRebol.cxx @@ -7193,6 +7230,9 @@ $(OBJS)\wxscintilla_LexRuby.obj: ..\..\src\stc\scintilla\lexers\LexRuby.cxx $(OBJS)\wxscintilla_LexRust.obj: ..\..\src\stc\scintilla\lexers\LexRust.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexRust.cxx +$(OBJS)\wxscintilla_LexSAS.obj: ..\..\src\stc\scintilla\lexers\LexSAS.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSAS.cxx + $(OBJS)\wxscintilla_LexScriptol.obj: ..\..\src\stc\scintilla\lexers\LexScriptol.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexScriptol.cxx @@ -7214,6 +7254,9 @@ $(OBJS)\wxscintilla_LexSpice.obj: ..\..\src\stc\scintilla\lexers\LexSpice.cxx $(OBJS)\wxscintilla_LexSQL.obj: ..\..\src\stc\scintilla\lexers\LexSQL.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSQL.cxx +$(OBJS)\wxscintilla_LexStata.obj: ..\..\src\stc\scintilla\lexers\LexStata.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexStata.cxx + $(OBJS)\wxscintilla_LexSTTXT.obj: ..\..\src\stc\scintilla\lexers\LexSTTXT.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSTTXT.cxx @@ -7250,6 +7293,9 @@ $(OBJS)\wxscintilla_LexVHDL.obj: ..\..\src\stc\scintilla\lexers\LexVHDL.cxx $(OBJS)\wxscintilla_LexVisualProlog.obj: ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx +$(OBJS)\wxscintilla_LexX12.obj: ..\..\src\stc\scintilla\lexers\LexX12.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexX12.cxx + $(OBJS)\wxscintilla_LexYAML.obj: ..\..\src\stc\scintilla\lexers\LexYAML.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexYAML.cxx @@ -7262,6 +7308,9 @@ $(OBJS)\wxscintilla_CharacterCategory.obj: ..\..\src\stc\scintilla\lexlib\Charac $(OBJS)\wxscintilla_CharacterSet.obj: ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx +$(OBJS)\wxscintilla_DefaultLexer.obj: ..\..\src\stc\scintilla\lexlib\DefaultLexer.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\DefaultLexer.cxx + $(OBJS)\wxscintilla_LexerBase.obj: ..\..\src\stc\scintilla\lexlib\LexerBase.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerBase.cxx @@ -7307,6 +7356,9 @@ $(OBJS)\wxscintilla_CharClassify.obj: ..\..\src\stc\scintilla\src\CharClassify.c $(OBJS)\wxscintilla_ContractionState.obj: ..\..\src\stc\scintilla\src\ContractionState.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ContractionState.cxx +$(OBJS)\wxscintilla_DBCS.obj: ..\..\src\stc\scintilla\src\DBCS.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\DBCS.cxx + $(OBJS)\wxscintilla_Decoration.obj: ..\..\src\stc\scintilla\src\Decoration.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Decoration.cxx @@ -7316,12 +7368,12 @@ $(OBJS)\wxscintilla_Document.obj: ..\..\src\stc\scintilla\src\Document.cxx $(OBJS)\wxscintilla_EditModel.obj: ..\..\src\stc\scintilla\src\EditModel.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\EditModel.cxx -$(OBJS)\wxscintilla_EditView.obj: ..\..\src\stc\scintilla\src\EditView.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\EditView.cxx - $(OBJS)\wxscintilla_Editor.obj: ..\..\src\stc\scintilla\src\Editor.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Editor.cxx +$(OBJS)\wxscintilla_EditView.obj: ..\..\src\stc\scintilla\src\EditView.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\EditView.cxx + $(OBJS)\wxscintilla_ExternalLexer.obj: ..\..\src\stc\scintilla\src\ExternalLexer.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ExternalLexer.cxx @@ -7361,6 +7413,9 @@ $(OBJS)\wxscintilla_Style.obj: ..\..\src\stc\scintilla\src\Style.cxx $(OBJS)\wxscintilla_UniConversion.obj: ..\..\src\stc\scintilla\src\UniConversion.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\UniConversion.cxx +$(OBJS)\wxscintilla_UniqueString.obj: ..\..\src\stc\scintilla\src\UniqueString.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\UniqueString.cxx + $(OBJS)\wxscintilla_ViewStyle.obj: ..\..\src\stc\scintilla\src\ViewStyle.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ViewStyle.cxx @@ -9955,7 +10010,7 @@ $(OBJS)\monodll_bmpsvg.obj: ..\..\src\generic\bmpsvg.cpp !endif $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\3rdparty\pcre\src\wx /i ..\..\src\expat\expat\lib $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) $(__TARGET_CPU_COMPFLAG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d NO_CXX11_REGEX /d LINK_LEXERS /i ..\..\3rdparty\webview2\build\native\include /d wxUSE_BASE=1 /d WXMAKINGDLL ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\3rdparty\pcre\src\wx /i ..\..\src\expat\expat\lib $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) $(__TARGET_CPU_COMPFLAG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /i ..\..\3rdparty\webview2\build\native\include /d wxUSE_BASE=1 /d WXMAKINGDLL ..\..\src\msw\version.rc $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp @@ -17854,7 +17909,7 @@ $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\3rdparty\pcre\src\wx /i ..\..\src\expat\expat\lib $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) $(__TARGET_CPU_COMPFLAG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d NO_CXX11_REGEX /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\3rdparty\pcre\src\wx /i ..\..\src\expat\expat\lib $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) $(__TARGET_CPU_COMPFLAG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp diff --git a/build/msw/wx_stc.vcxproj b/build/msw/wx_stc.vcxproj index da9d9e02ab..855f8f01a3 100644 --- a/build/msw/wx_stc.vcxproj +++ b/build/msw/wx_stc.vcxproj @@ -133,13 +133,13 @@ - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) Disabled $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) Sync EnableFastChecks $(wxDebugRuntimeLibrary) @@ -154,7 +154,7 @@ true - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) 0x0409 $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) @@ -168,13 +168,13 @@ - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) Disabled $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) Sync EnableFastChecks $(wxDebugRuntimeLibrary) @@ -189,7 +189,7 @@ true - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) 0x0409 $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) @@ -204,13 +204,13 @@ - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) MaxSpeed $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) true @@ -227,7 +227,7 @@ true - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) 0x0409 $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) @@ -242,13 +242,13 @@ - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) MaxSpeed $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) true @@ -264,7 +264,7 @@ true - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) 0x0409 $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) @@ -279,13 +279,13 @@ - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) Disabled $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) Sync EnableFastChecks $(wxDebugRuntimeLibrary) @@ -300,7 +300,7 @@ true - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) 0x0409 $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) @@ -320,13 +320,13 @@ - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) Disabled $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) Sync EnableFastChecks $(wxDebugRuntimeLibrary) @@ -341,7 +341,7 @@ true - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) 0x0409 $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) @@ -360,13 +360,13 @@ - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) MaxSpeed $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) true @@ -382,7 +382,7 @@ true - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) 0x0409 $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) @@ -404,13 +404,13 @@ - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) MaxSpeed $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) true @@ -426,7 +426,7 @@ true - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) 0x0409 $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\3rdparty\pcre\src;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) diff --git a/build/msw/wx_wxscintilla.vcxproj b/build/msw/wx_wxscintilla.vcxproj index 5443f48a10..d7ccb58b30 100644 --- a/build/msw/wx_wxscintilla.vcxproj +++ b/build/msw/wx_wxscintilla.vcxproj @@ -133,13 +133,13 @@ - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) Disabled ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync EnableFastChecks $(wxDebugRuntimeLibrary) @@ -151,7 +151,7 @@ true - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) @@ -166,13 +166,13 @@ - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) Disabled ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync EnableFastChecks $(wxDebugRuntimeLibrary) @@ -184,7 +184,7 @@ true - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) @@ -199,13 +199,13 @@ - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) MaxSpeed ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) true @@ -219,7 +219,7 @@ true - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) @@ -235,13 +235,13 @@ - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) MaxSpeed ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) true @@ -254,7 +254,7 @@ true - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) @@ -269,13 +269,13 @@ - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) Disabled ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync EnableFastChecks $(wxDebugRuntimeLibrary) @@ -287,7 +287,7 @@ true - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) @@ -302,13 +302,13 @@ - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) Disabled ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync EnableFastChecks $(wxDebugRuntimeLibrary) @@ -320,7 +320,7 @@ true - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) @@ -335,13 +335,13 @@ - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) MaxSpeed ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) true @@ -354,7 +354,7 @@ true - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) @@ -369,13 +369,13 @@ - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) MaxSpeed ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) Sync $(wxReleaseRuntimeLibrary) true @@ -388,7 +388,7 @@ true - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;LPEG_LEXER=0;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) 0x0409 ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) @@ -402,117 +402,108 @@ - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + + + + + - + - + + + - + + - - - + + + + + - + + + - - - + + - - - + + + + + @@ -521,28 +512,51 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - diff --git a/build/msw/wx_wxscintilla.vcxproj.filters b/build/msw/wx_wxscintilla.vcxproj.filters index 40b75c75fc..a40a2d65c5 100644 --- a/build/msw/wx_wxscintilla.vcxproj.filters +++ b/build/msw/wx_wxscintilla.vcxproj.filters @@ -11,69 +11,24 @@ - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - Source Files + + Source Files + + + Source Files + Source Files + + Source Files + + + Source Files + Source Files @@ -86,18 +41,6 @@ Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - Source Files @@ -116,39 +59,45 @@ Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - Source Files + + Source Files + + + Source Files + Source Files + + Source Files + Source Files Source Files + + Source Files + Source Files Source Files + + Source Files + Source Files + + Source Files + Source Files @@ -164,9 +113,6 @@ Source Files - - Source Files - Source Files @@ -176,6 +122,9 @@ Source Files + + Source Files + Source Files @@ -191,15 +140,21 @@ Source Files - - Source Files - Source Files Source Files + + Source Files + + + Source Files + + + Source Files + Source Files @@ -212,7 +167,7 @@ Source Files - + Source Files @@ -221,18 +176,12 @@ Source Files + + Source Files + Source Files - - Source Files - - - Source Files - - - Source Files - Source Files @@ -245,15 +194,30 @@ Source Files + + Source Files + Source Files + + Source Files + Source Files + + Source Files + + + Source Files + Source Files + + Source Files + Source Files @@ -263,15 +227,21 @@ Source Files - - Source Files - Source Files + + Source Files + + + Source Files + Source Files + + Source Files + Source Files @@ -281,15 +251,6 @@ Source Files - - Source Files - - - Source Files - - - Source Files - Source Files @@ -302,12 +263,18 @@ Source Files + + Source Files + Source Files Source Files + + Source Files + Source Files @@ -320,13 +287,7 @@ Source Files - - Source Files - - - Source Files - - + Source Files @@ -335,6 +296,9 @@ Source Files + + Source Files + Source Files @@ -344,6 +308,15 @@ Source Files + + Source Files + + + Source Files + + + Source Files + Source Files @@ -368,18 +341,33 @@ Source Files - + Source Files - + Source Files Source Files + + Source Files + Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + Source Files @@ -392,6 +380,66 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + Source Files @@ -404,9 +452,6 @@ Source Files - - Source Files - Source Files @@ -422,16 +467,13 @@ Source Files - - Source Files - Source Files - + Source Files - + Source Files diff --git a/build/osx/wx.xcconfig b/build/osx/wx.xcconfig index eeafdb6021..b588167e91 100644 --- a/build/osx/wx.xcconfig +++ b/build/osx/wx.xcconfig @@ -13,7 +13,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/regex" "$(WXROOT)/3rdparty/pcre/src/wx" USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/expat/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib" "$(WXROOT)/3rdparty/pcre/src/wx" ALWAYS_SEARCH_USER_PATHS = NO -WX_PREPROCESSOR_DEFINITIONS = WXBUILDING $(WXPLATFORM) __WX__ _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER NO_CXX11_REGEX WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1 HAVE_CONFIG_H PNG_NO_CONFIG_H +WX_PREPROCESSOR_DEFINITIONS = WXBUILDING $(WXPLATFORM) __WX__ _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1 HAVE_CONFIG_H PNG_NO_CONFIG_H GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS) GCC_PFE_FILE_C_DIALECTS = c++ objective-c++ GCC_C_LANGUAGE_STANDARD = gnu99 diff --git a/src/stc/scintilla/README.txt b/src/stc/scintilla/README.txt index 79de26b48e..a84131d4eb 100644 --- a/src/stc/scintilla/README.txt +++ b/src/stc/scintilla/README.txt @@ -5,7 +5,7 @@ directory above this one. The current version of the Scintilla code is 3.7.2 -These are the basic steps needed to update the version of Scintilla used by wxSTC. +These are the basic steps needed to update the version of Scintilla used by wxSTC. 1. Copy include, lexers, lexlib and src folders to src/stc/scintilla @@ -15,9 +15,9 @@ new method names or constants because some of them may need to be tweaked to conform to similar naming patterns already used. (See step #6 below.) -3. Identify new source files and update build/bakefiles/scintilla.bkl -accordingly so the new files will get built. Use bakefile to -regenerate the makefiles and project files. +3. Identify new source files and update build/bakefiles/scintilla.bkl and +build/cmake/lib/stc/CMakeLists.txt accordingly so the new files will get +built. Use bakefile to regenerate the makefiles and project files. 4. Examine changes in src/stc/scintilla/include/Platform.h and identify new or changed APIs that the wx "platform" will need to