From 4ad886ca8666124d39b775041184784e4f52b353 Mon Sep 17 00:00:00 2001 From: Paul Kulchenko Date: Thu, 2 Jun 2016 21:45:09 -0700 Subject: [PATCH] Update build files to add new lexer in Scintilla 3.6.6 (LexJSON). --- build/msw/makefile.bcc | 4 ++++ build/msw/makefile.gcc | 4 ++++ build/msw/makefile.vc | 4 ++++ build/msw/wx_vc7_wxscintilla.vcproj | 3 +++ build/msw/wx_vc8_wxscintilla.vcproj | 4 ++++ build/msw/wx_vc9_wxscintilla.vcproj | 4 ++++ build/msw/wx_wxscintilla.vcxproj | 1 + build/msw/wx_wxscintilla.vcxproj.filters | 3 +++ 8 files changed, 27 insertions(+) diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 6b0ce1363b..e56fb0b48f 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -248,6 +248,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexHex.obj \ $(OBJS)\wxscintilla_LexHTML.obj \ $(OBJS)\wxscintilla_LexInno.obj \ + $(OBJS)\wxscintilla_LexJSON.obj \ $(OBJS)\wxscintilla_LexKix.obj \ $(OBJS)\wxscintilla_LexKVIrc.obj \ $(OBJS)\wxscintilla_LexLaTeX.obj \ @@ -6106,6 +6107,9 @@ $(OBJS)\wxscintilla_LexHTML.obj: ..\..\src\stc\scintilla\lexers\LexHTML.cxx $(OBJS)\wxscintilla_LexInno.obj: ..\..\src\stc\scintilla\lexers\LexInno.cxx $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexInno.cxx +$(OBJS)\wxscintilla_LexJSON.obj: ..\..\src\stc\scintilla\lexers\LexJSON.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexJSON.cxx + $(OBJS)\wxscintilla_LexKix.obj: ..\..\src\stc\scintilla\lexers\LexKix.cxx $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexKix.cxx diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 749ab0bf02..e37c79a0d2 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -236,6 +236,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexHex.o \ $(OBJS)\wxscintilla_LexHTML.o \ $(OBJS)\wxscintilla_LexInno.o \ + $(OBJS)\wxscintilla_LexJSON.o \ $(OBJS)\wxscintilla_LexKix.o \ $(OBJS)\wxscintilla_LexKVIrc.o \ $(OBJS)\wxscintilla_LexLaTeX.o \ @@ -6281,6 +6282,9 @@ $(OBJS)\wxscintilla_LexHTML.o: ../../src/stc/scintilla/lexers/LexHTML.cxx $(OBJS)\wxscintilla_LexInno.o: ../../src/stc/scintilla/lexers/LexInno.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\wxscintilla_LexJSON.o: ../../src/stc/scintilla/lexers/LexJSON.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\wxscintilla_LexKix.o: ../../src/stc/scintilla/lexers/LexKix.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 242c2ddea6..eb07811df1 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -259,6 +259,7 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_LexHex.obj \ $(OBJS)\wxscintilla_LexHTML.obj \ $(OBJS)\wxscintilla_LexInno.obj \ + $(OBJS)\wxscintilla_LexJSON.obj \ $(OBJS)\wxscintilla_LexKix.obj \ $(OBJS)\wxscintilla_LexKVIrc.obj \ $(OBJS)\wxscintilla_LexLaTeX.obj \ @@ -6798,6 +6799,9 @@ $(OBJS)\wxscintilla_LexHTML.obj: ..\..\src\stc\scintilla\lexers\LexHTML.cxx $(OBJS)\wxscintilla_LexInno.obj: ..\..\src\stc\scintilla\lexers\LexInno.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexInno.cxx +$(OBJS)\wxscintilla_LexJSON.obj: ..\..\src\stc\scintilla\lexers\LexJSON.cxx + $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexJSON.cxx + $(OBJS)\wxscintilla_LexKix.obj: ..\..\src\stc\scintilla\lexers\LexKix.cxx $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexKix.cxx diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj index 373848453b..709608e902 100644 --- a/build/msw/wx_vc7_wxscintilla.vcproj +++ b/build/msw/wx_vc7_wxscintilla.vcproj @@ -436,6 +436,9 @@ + + diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj index 1ca5b9fc08..ec8bb8447d 100644 --- a/build/msw/wx_vc8_wxscintilla.vcproj +++ b/build/msw/wx_vc8_wxscintilla.vcproj @@ -930,6 +930,10 @@ RelativePath="..\..\src\stc\scintilla\lexers\LexInno.cxx" > + + diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj index adf9908e07..94d099ee11 100644 --- a/build/msw/wx_vc9_wxscintilla.vcproj +++ b/build/msw/wx_vc9_wxscintilla.vcproj @@ -926,6 +926,10 @@ RelativePath="..\..\src\stc\scintilla\lexers\LexInno.cxx" > + + diff --git a/build/msw/wx_wxscintilla.vcxproj b/build/msw/wx_wxscintilla.vcxproj index 2008b35a65..3b4568928b 100644 --- a/build/msw/wx_wxscintilla.vcxproj +++ b/build/msw/wx_wxscintilla.vcxproj @@ -465,6 +465,7 @@ + diff --git a/build/msw/wx_wxscintilla.vcxproj.filters b/build/msw/wx_wxscintilla.vcxproj.filters index d873911274..37f440cad7 100644 --- a/build/msw/wx_wxscintilla.vcxproj.filters +++ b/build/msw/wx_wxscintilla.vcxproj.filters @@ -200,6 +200,9 @@ Source Files + + Source Files + Source Files