diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/deps.mak | 146 | ||||
| -rw-r--r-- | win32/makefile | 4 | ||||
| -rw-r--r-- | win32/scintilla.mak | 27 | ||||
| -rw-r--r-- | win32/scintilla_vc6.mak | 27 |
4 files changed, 100 insertions, 104 deletions
diff --git a/win32/deps.mak b/win32/deps.mak index d41c20a13..ff9610bc8 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -1,7 +1,7 @@ PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \ ../src/UniConversion.h ../src/XPM.h ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -9,7 +9,7 @@ ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/UniConversion.h AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../src/AutoComplete.h CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/CallTip.h CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \ @@ -27,7 +27,7 @@ Document.o: ../src/Document.cxx ../include/Platform.h \ ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ ../src/RESearch.h DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/PropSet.h ../src/SVector.h \ ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ @@ -40,228 +40,226 @@ Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/Accessor.h ../src/DocumentAccessor.h \ ../include/KeyWords.h ../src/ExternalLexer.h Indicator.o: ../src/Indicator.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/Indicator.h KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/KeyMap.h KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/Accessor.h \ - ../src/StyleContext.h ../include/PropSet.h ../include/SString.h \ - ../include/KeyWords.h ../include/SciLexer.h ../include/SString.h + ../src/StyleContext.h ../include/PropSet.h \ + ../include/KeyWords.h ../include/SciLexer.h LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAsn1.o: ../src/LexAsn1.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.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/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexBasic.o: ../src/LexBasic.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.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/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCaml.o: ../src/LexCaml.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCmake.o: ../src/LexCmake.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCsound.o: ../src/LexCsound.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexD.o: ../src/LexD.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.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 \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.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 \ + ../include/PropSet.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 \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexForth.o: ../src/LexForth.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexHaskell.o: ../src/LexHaskell.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexInno.o: ../src/LexInno.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexKix.o: ../src/LexKix.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.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/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexMetapost.o: ../src/LexMetapost.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexMPT.o: ../src/LexMPT.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 ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexOpal.o: ../src/LexOpal.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h LexPB.o: ../src/LexPB.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexPOV.o: ../src/LexPOV.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPS.o: ../src/LexPS.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPython.o: ../src/LexPython.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexRebol.o: ../src/LexRebol.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexSmalltalk.o: ../src/LexSmalltalk.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexSpecman.o: ../src/LexSpecman.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexSpice.o: ../src/LexSpice.cxx ../include/Platform.h \ ../include/Accessor.h ../src/StyleContext.h ../include/PropSet.h \ - ../include/SString.h ../include/KeyWords.h ../include/SciLexer.h \ - ../include/SString.h + ../include/KeyWords.h ../include/SciLexer.h LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexTADS3.o: ../src/LexTADS3.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexTCL.o: ../src/LexTCL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexVHDL.o: ../src/LexVHDL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.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/XPM.h ../src/LineMarker.h -PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h +PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h RESearch.o: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h RunStyles.o: ../src/RunStyles.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -271,7 +269,7 @@ ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Style.h StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ @@ -279,6 +277,6 @@ ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/WindowAccessor.h ../include/Scintilla.h XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h diff --git a/win32/makefile b/win32/makefile index 5f495c7a4..79761a38c 100644 --- a/win32/makefile +++ b/win32/makefile @@ -90,12 +90,12 @@ include deps.mak ScintillaBaseL.o: ScintillaBase.cxx Platform.h Scintilla.h SciLexer.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \ - ScintillaBase.h PropSet.h SString.h Accessor.h DocumentAccessor.h \ + ScintillaBase.h PropSet.h Accessor.h DocumentAccessor.h \ KeyWords.h ExternalLexer.h PerLine.h ScintillaWinL.o: ScintillaWin.cxx Platform.h Scintilla.h SciLexer.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \ - ScintillaBase.h PropSet.h SString.h Accessor.h KeyWords.h \ + ScintillaBase.h PropSet.h Accessor.h KeyWords.h \ ExternalLexer.h UniConversion.h PerLine.h ScintillaWinS.o: ScintillaWin.cxx Platform.h Scintilla.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index ad8fa150c..f78c9f775 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -269,11 +269,11 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx # All lexers depend on this set of headers LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ + ..\include\Accessor.h ..\include\KeyWords.h \ ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../src/AutoComplete.h $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/CallTip.h $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \ @@ -291,7 +291,7 @@ $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \ ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ ../src/RESearch.h ../src/PerLine.h $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/PropSet.h ../src/SVector.h \ ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ @@ -304,14 +304,14 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintill ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/Accessor.h ../src/DocumentAccessor.h \ ../include/KeyWords.h ../src/ExternalLexer.h $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/Indicator.h $(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/KeyMap.h $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h #++Autogenerated -- run src/LexGen.py to regenerate @@ -487,14 +487,13 @@ $(DIR_O)\PositionCache.obj: ../src/Editor.cxx ../include/Platform.h ../include/S ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h -$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h +$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h $(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h $(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -502,7 +501,7 @@ $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -510,7 +509,7 @@ $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -518,7 +517,7 @@ $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -526,7 +525,7 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -538,7 +537,7 @@ $(DIR_O)\Selection.obj: ../src/Selection.cxx ../include/Platform.h ../include/Sc $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Style.h $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ @@ -546,6 +545,6 @@ $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/WindowAccessor.h ../include/Scintilla.h $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index b21cdc742..d160c38a0 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -271,11 +271,11 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx # All lexers depend on this set of headers LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ + ..\include\Accessor.h ..\include\KeyWords.h \ ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../src/AutoComplete.h $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/CallTip.h $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \ @@ -293,7 +293,7 @@ $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \ ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ ../src/RESearch.h ../src/PerLine.h $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/PropSet.h ../src/SVector.h \ ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ @@ -306,14 +306,14 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintill ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/Accessor.h ../src/DocumentAccessor.h \ ../include/KeyWords.h ../src/ExternalLexer.h $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/Indicator.h $(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/KeyMap.h $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h #++Autogenerated -- run src/LexGen.py to regenerate @@ -489,14 +489,13 @@ $(DIR_O)\PositionCache.obj: ../src/Editor.cxx ../include/Platform.h ../include/S ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h -$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h +$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h $(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h $(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -504,7 +503,7 @@ $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -512,7 +511,7 @@ $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -520,7 +519,7 @@ $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -528,7 +527,7 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -540,7 +539,7 @@ $(DIR_O)\Selection.obj: ../src/Selection.cxx ../include/Platform.h ../include/Sc $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Style.h $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ @@ -548,6 +547,6 @@ $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/WindowAccessor.h ../include/Scintilla.h $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h |