diff options
| -rw-r--r-- | src/KeyWords.cxx | 2 | ||||
| -rw-r--r-- | win32/deps.mak | 17 | ||||
| -rw-r--r-- | win32/makefile | 5 | ||||
| -rw-r--r-- | win32/scintilla.mak | 3 | 
4 files changed, 20 insertions, 7 deletions
| diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx index c759d600f..b87853a19 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -108,6 +108,7 @@ LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null");  int wxForceScintillaLexers(void) {    extern LexerModule lmAda;    extern LexerModule lmAVE; +  extern LexerModule lmBaan;    extern LexerModule lmBatch;    extern LexerModule lmConf;    extern LexerModule lmCPP; @@ -133,6 +134,7 @@ int wxForceScintillaLexers(void) {    if (        &lmAda        && &lmAVE +      && &lmBaan        && &lmConf        && &lmDiff        && &lmLatex diff --git a/win32/deps.mak b/win32/deps.mak index 7a7f4eaae..8f13f2a93 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -1,5 +1,5 @@ -ExternalLexer.o: ExternalLexer.cxx ../include/SciLexer.h \ - ../include/Platform.h ../include/PropSet.h ../include/SString.h \ +ExternalLexer.o: ExternalLexer.cxx ../include/Platform.h \ + ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \   ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \   ExternalLexer.h  PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \ @@ -43,6 +43,10 @@ LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/PropSet.h \  LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \   ../include/Scintilla.h ../include/SciLexer.h +LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h  LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h @@ -61,7 +65,8 @@ LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \   ../include/SciLexer.h  LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h \   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ - ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h  LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h \   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h @@ -88,8 +93,8 @@ LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \   ../include/Scintilla.h ../include/SciLexer.h  LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ - ../include/Scintilla.h ../include/SciLexer.h + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h  LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \   ../include/Scintilla.h ../src/LineMarker.h  ListLexers.o: ../src/ListLexers.cxx ../include/Platform.h \ @@ -117,3 +122,5 @@ ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \  WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \   ../include/WindowAccessor.h ../include/Scintilla.h +xContractionState.o: ../src/xContractionState.cxx \ + ../include/Platform.h ../src/ContractionState.h diff --git a/win32/makefile b/win32/makefile index 6526c777e..90664cf37 100644 --- a/win32/makefile +++ b/win32/makefile @@ -37,9 +37,10 @@ clean:  deps:  	$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak -LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexCrontab.o LexEiffel.o LexHTML.o \ +LEXOBJS=LexAda.o LexAVE.o LexBaan.o LexBullant.o LexConf.o \ +	LexCPP.o LexCrontab.o LexEiffel.o LexHTML.o \  	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \ -	LexPython.o LexRuby.o LexSQL.o LexVB.o LexBullant.o +	LexPython.o LexRuby.o LexSQL.o LexVB.o  SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o Document.o \  	ContractionState.o CellBuffer.o CallTip.o \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index cbc05d082..e50f62d75 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -107,6 +107,7 @@ SOBJS=\  LEXOBJS=\  	$(DIR_O)\LexAda.obj \  	$(DIR_O)\LexAVE.obj \ +	$(DIR_O)\LexBaan.obj \  	$(DIR_O)\LexBullant.obj \  	$(DIR_O)\LexConf.obj \  	$(DIR_O)\LexCPP.obj \ @@ -230,6 +231,8 @@ $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS)  $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) +$(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS) +  $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS)  $(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS) | 
