diff options
-rw-r--r-- | gtk/makefile | 12 | ||||
-rw-r--r-- | gtk/scintilla.mak | 3 | ||||
-rw-r--r-- | macosx/deps.mak | 4 | ||||
-rw-r--r-- | macosx/makefile | 12 | ||||
-rw-r--r-- | src/KeyWords.cxx | 1 | ||||
-rw-r--r-- | vcbuild/SciLexer.dsp | 4 | ||||
-rw-r--r-- | win32/deps.mak | 4 | ||||
-rw-r--r-- | win32/makefile | 12 | ||||
-rw-r--r-- | win32/scintilla.mak | 3 | ||||
-rw-r--r-- | win32/scintilla_vc6.mak | 3 |
10 files changed, 18 insertions, 40 deletions
diff --git a/gtk/makefile b/gtk/makefile index f6fde6c66..e42e0ba38 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -66,12 +66,12 @@ LEXOBJS=\ LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \ LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \ LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \ -LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o \ -LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \ -LexLout.o LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \ -LexMSSQL.o LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o \ -LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o \ -LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \ +LexEiffel.o LexErlang.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \ +LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \ +LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ +LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o \ +LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o LexPS.o \ +LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \ LexSorcus.o LexSpecman.o LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o \ LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak index 537a2a503..2d971e644 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -167,7 +167,6 @@ LEXOBJS=\ $(DIR_O)\LexD.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ - $(DIR_O)\LexEScript.obj \ $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ @@ -408,8 +407,6 @@ $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS) $(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS) -$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) - $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) diff --git a/macosx/deps.mak b/macosx/deps.mak index 5c65dcc1f..251fcb8f5 100644 --- a/macosx/deps.mak +++ b/macosx/deps.mak @@ -136,10 +136,6 @@ LexCsound.o: ../src/LexCsound.cxx ../include/Platform.h \ LexD.o: ../src/LexD.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 -LexEScript.o: ../src/LexEScript.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 LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ diff --git a/macosx/makefile b/macosx/makefile index 342021ba8..bbf602bda 100644 --- a/macosx/makefile +++ b/macosx/makefile @@ -66,12 +66,12 @@ LEXOBJS=\ LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \ LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \ LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \ -LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o \ -LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \ -LexLout.o LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \ -LexMSSQL.o LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o \ -LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o \ -LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \ +LexEiffel.o LexErlang.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \ +LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \ +LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ +LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o \ +LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o LexPS.o \ +LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \ LexSorcus.o LexSpecman.o LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o \ LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx index d5d7499df..549c32a7a 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -171,7 +171,6 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmEiffelkw); LINK_LEXER(lmErlang); LINK_LEXER(lmErrorList); - LINK_LEXER(lmESCRIPT); LINK_LEXER(lmF77); LINK_LEXER(lmFlagShip); LINK_LEXER(lmForth); diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp index 2d21a9e27..e1b44fb0c 100644 --- a/vcbuild/SciLexer.dsp +++ b/vcbuild/SciLexer.dsp @@ -242,10 +242,6 @@ SOURCE=..\src\LexErlang.cxx # End Source File # Begin Source File -SOURCE=..\src\LexEScript.cxx -# End Source File -# Begin Source File - SOURCE=..\src\LexFlagship.cxx # End Source File # Begin Source File diff --git a/win32/deps.mak b/win32/deps.mak index d41c20a13..a308efa62 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -116,10 +116,6 @@ LexErlang.o: ../src/LexErlang.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 -LexEScript.o: ../src/LexEScript.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 LexFlagship.o: ../src/LexFlagship.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ diff --git a/win32/makefile b/win32/makefile index d0f2eec4f..67020ae0b 100644 --- a/win32/makefile +++ b/win32/makefile @@ -54,12 +54,12 @@ LEXOBJS=\ LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \ LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \ LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \ -LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o \ -LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \ -LexLout.o LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \ -LexMSSQL.o LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o \ -LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o \ -LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \ +LexEiffel.o LexErlang.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \ +LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \ +LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ +LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o \ +LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o LexPS.o \ +LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \ LexSorcus.o LexSpecman.o LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o \ LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 2dad3609e..3ed660f76 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -137,7 +137,6 @@ LEXOBJS=\ $(DIR_O)\LexD.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ - $(DIR_O)\LexEScript.obj \ $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ @@ -359,8 +358,6 @@ $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS) $(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS) -$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) - $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index 8c6e55f90..9708ff2f1 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -139,7 +139,6 @@ LEXOBJS=\ $(DIR_O)\LexD.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ - $(DIR_O)\LexEScript.obj \ $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ @@ -361,8 +360,6 @@ $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS) $(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS) -$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) - $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) |