diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/deps.mak | 134 | ||||
| -rw-r--r-- | win32/scintilla.mak | 17 | 
2 files changed, 81 insertions, 70 deletions
| diff --git a/win32/deps.mak b/win32/deps.mak index 15d24ee61..ca7ff95a9 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -1,31 +1,28 @@  HanjaDic.o: HanjaDic.cxx ../src/UniConversion.h HanjaDic.h -PlatWin.o: PlatWin.cxx ../include/Platform.h ../lexlib/StringCopy.h \ - ../src/XPM.h ../src/UniConversion.h ../src/DBCS.h ../src/FontQuality.h \ - PlatWin.h +PlatWin.o: PlatWin.cxx ../include/Platform.h ../src/XPM.h \ + ../src/UniConversion.h ../src/DBCS.h ../src/FontQuality.h PlatWin.h  ScintillaDLL.o: ScintillaDLL.cxx ../include/Scintilla.h \   ../include/Sci_Position.h ScintillaWin.h  ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \   ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \ - ../include/Scintilla.h ../lexlib/StringCopy.h ../src/Position.h \ - ../src/UniqueString.h ../src/SplitVector.h ../src/Partitioning.h \ - ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \ - ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h \ - ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ - ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \ - ../src/CaseConvert.h ../src/UniConversion.h ../src/Selection.h \ - ../src/PositionCache.h ../src/EditModel.h ../src/MarginView.h \ - ../src/EditView.h ../src/Editor.h ../src/ElapsedPeriod.h \ - ../src/AutoComplete.h ../src/ScintillaBase.h PlatWin.h HanjaDic.h \ - ScintillaWin.h + ../include/Scintilla.h ../src/Position.h ../src/UniqueString.h \ + ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \ + ../src/ContractionState.h ../src/CellBuffer.h ../src/CallTip.h \ + ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \ + ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/CaseFolder.h ../src/Document.h ../src/CaseConvert.h \ + ../src/UniConversion.h ../src/Selection.h ../src/PositionCache.h \ + ../src/EditModel.h ../src/MarginView.h ../src/EditView.h ../src/Editor.h \ + ../src/ElapsedPeriod.h ../src/AutoComplete.h ../src/ScintillaBase.h \ + PlatWin.h HanjaDic.h ScintillaWin.h  AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \   ../include/Scintilla.h ../include/Sci_Position.h \   ../lexlib/CharacterSet.h ../src/Position.h ../src/AutoComplete.h  CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/Sci_Position.h \ - ../src/IntegerRectangle.h ../lexlib/StringCopy.h ../src/Position.h \ - ../src/CallTip.h -CaseConvert.o: ../src/CaseConvert.cxx ../lexlib/StringCopy.h \ - ../src/CaseConvert.h ../src/UniConversion.h + ../include/Scintilla.h ../include/Sci_Position.h ../src/Position.h \ + ../src/IntegerRectangle.h ../src/CallTip.h +CaseConvert.o: ../src/CaseConvert.cxx ../src/CaseConvert.h \ + ../src/UniConversion.h  CaseFolder.o: ../src/CaseFolder.cxx ../src/CaseFolder.h \   ../src/CaseConvert.h  Catalogue.o: ../src/Catalogue.cxx ../include/ILexer.h \ @@ -35,7 +32,8 @@ CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \   ../include/Scintilla.h ../include/Sci_Position.h ../src/Position.h \   ../src/SplitVector.h ../src/Partitioning.h ../src/CellBuffer.h \   ../src/UniConversion.h -CharClassify.o: ../src/CharClassify.cxx ../src/CharClassify.h +CharClassify.o: ../src/CharClassify.cxx ../lexlib/CharacterSet.h \ + ../src/CharClassify.h  ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \   ../src/Position.h ../src/UniqueString.h ../src/SplitVector.h \   ../src/Partitioning.h ../src/RunStyles.h ../src/SparseVector.h \ @@ -55,34 +53,35 @@ Document.o: ../src/Document.cxx ../include/Platform.h \   ../src/UniConversion.h ../src/ElapsedPeriod.h  EditModel.o: ../src/EditModel.cxx ../include/Platform.h \   ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \ - ../include/Scintilla.h ../lexlib/StringCopy.h ../src/Position.h \ - ../src/UniqueString.h ../src/SplitVector.h ../src/Partitioning.h \ - ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \ - ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \ - ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \ - ../src/CaseFolder.h ../src/Document.h ../src/UniConversion.h \ - ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h + ../include/Scintilla.h ../src/Position.h ../src/UniqueString.h \ + ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \ + ../src/ContractionState.h ../src/CellBuffer.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ + ../src/CharClassify.h ../src/Decoration.h ../src/CaseFolder.h \ + ../src/Document.h ../src/UniConversion.h ../src/Selection.h \ + ../src/PositionCache.h ../src/EditModel.h  Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/ILoader.h \   ../include/Sci_Position.h ../include/ILexer.h ../include/Scintilla.h \ - ../lexlib/StringCopy.h ../lexlib/CharacterSet.h ../src/Position.h \ - ../src/UniqueString.h ../src/SplitVector.h ../src/Partitioning.h \ - ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \ - ../src/PerLine.h ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h \ - ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ - ../src/Decoration.h ../src/CaseFolder.h ../src/Document.h \ - ../src/UniConversion.h ../src/Selection.h ../src/PositionCache.h \ - ../src/EditModel.h ../src/MarginView.h ../src/EditView.h ../src/Editor.h -EditView.o: ../src/EditView.cxx ../include/Platform.h \ - ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \ - ../include/Scintilla.h ../lexlib/StringCopy.h ../lexlib/CharacterSet.h \ - ../src/Position.h ../src/IntegerRectangle.h ../src/UniqueString.h \ + ../lexlib/CharacterSet.h ../src/Position.h ../src/UniqueString.h \   ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \   ../src/ContractionState.h ../src/CellBuffer.h ../src/PerLine.h \   ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \   ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \   ../src/CaseFolder.h ../src/Document.h ../src/UniConversion.h \   ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h \ - ../src/MarginView.h ../src/EditView.h ../src/ElapsedPeriod.h + ../src/MarginView.h ../src/EditView.h ../src/Editor.h \ + ../src/ElapsedPeriod.h +EditView.o: ../src/EditView.cxx ../include/Platform.h \ + ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \ + ../include/Scintilla.h ../lexlib/CharacterSet.h ../src/Position.h \ + ../src/IntegerRectangle.h ../src/UniqueString.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/ContractionState.h \ + ../src/CellBuffer.h ../src/PerLine.h ../src/KeyMap.h ../src/Indicator.h \ + ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ + ../src/CharClassify.h ../src/Decoration.h ../src/CaseFolder.h \ + ../src/Document.h ../src/UniConversion.h ../src/Selection.h \ + ../src/PositionCache.h ../src/EditModel.h ../src/MarginView.h \ + ../src/EditView.h ../src/ElapsedPeriod.h  ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \   ../include/ILexer.h ../include/Sci_Position.h ../include/Scintilla.h \   ../include/SciLexer.h ../lexlib/LexerModule.h ../src/Catalogue.h \ @@ -93,19 +92,18 @@ Indicator.o: ../src/Indicator.cxx ../include/Platform.h \  KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \   ../include/Sci_Position.h ../src/KeyMap.h  LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/Sci_Position.h ../lexlib/StringCopy.h \ + ../include/Scintilla.h ../include/Sci_Position.h \   ../src/IntegerRectangle.h ../src/XPM.h ../src/LineMarker.h  MarginView.o: ../src/MarginView.cxx ../include/Platform.h \   ../include/ILoader.h ../include/Sci_Position.h ../include/ILexer.h \ - ../include/Scintilla.h ../lexlib/StringCopy.h ../src/Position.h \ - ../src/IntegerRectangle.h ../src/UniqueString.h ../src/SplitVector.h \ - ../src/Partitioning.h ../src/RunStyles.h ../src/ContractionState.h \ - ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \ - ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ - ../src/CharClassify.h ../src/Decoration.h ../src/CaseFolder.h \ - ../src/Document.h ../src/UniConversion.h ../src/Selection.h \ - ../src/PositionCache.h ../src/EditModel.h ../src/MarginView.h \ - ../src/EditView.h + ../include/Scintilla.h ../src/Position.h ../src/IntegerRectangle.h \ + ../src/UniqueString.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \ + ../src/KeyMap.h ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \ + ../src/ViewStyle.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/CaseFolder.h ../src/Document.h ../src/UniConversion.h \ + ../src/Selection.h ../src/PositionCache.h ../src/EditModel.h \ + ../src/MarginView.h ../src/EditView.h  PerLine.o: ../src/PerLine.cxx ../include/Platform.h \   ../include/Scintilla.h ../include/Sci_Position.h ../src/Position.h \   ../src/SplitVector.h ../src/Partitioning.h ../src/CellBuffer.h \ @@ -180,8 +178,7 @@ PropSetSimple.o: ../lexlib/PropSetSimple.cxx ../lexlib/PropSetSimple.h  StyleContext.o: ../lexlib/StyleContext.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \   ../lexlib/StyleContext.h ../lexlib/CharacterSet.h -WordList.o: ../lexlib/WordList.cxx ../lexlib/StringCopy.h \ - ../lexlib/WordList.h +WordList.o: ../lexlib/WordList.cxx ../lexlib/WordList.h  LexA68k.o: ../lexers/LexA68k.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \   ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ @@ -239,9 +236,10 @@ LexBaan.o: ../lexers/LexBaan.cxx ../include/ILexer.h \   ../lexlib/DefaultLexer.h  LexBash.o: ../lexers/LexBash.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \ - ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ + ../lexlib/StringCopy.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \   ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \ - ../lexlib/LexerModule.h + ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/SubStyles.h \ + ../lexlib/DefaultLexer.h  LexBasic.o: ../lexers/LexBasic.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \   ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/StyleContext.h \ @@ -267,6 +265,12 @@ LexCaml.o: ../lexers/LexCaml.cxx ../include/ILexer.h \   ../lexlib/PropSetSimple.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \   ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \   ../lexlib/LexerModule.h +LexCIL.o: ../lexers/LexCIL.cxx ../include/ILexer.h \ + ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \ + ../lexlib/StringCopy.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \ + ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \ + ../lexlib/CharacterCategory.h ../lexlib/LexerModule.h \ + ../lexlib/OptionSet.h ../lexlib/DefaultLexer.h  LexCLW.o: ../lexers/LexCLW.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \   ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ @@ -399,9 +403,9 @@ LexHex.o: ../lexers/LexHex.cxx ../include/ILexer.h \   ../lexlib/LexerModule.h  LexHTML.o: ../lexers/LexHTML.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \ - ../lexlib/StringCopy.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \ - ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \ - ../lexlib/LexerModule.h + ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ + ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \ + ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/DefaultLexer.h  LexIndent.o: ../lexers/LexIndent.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \   ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ @@ -502,6 +506,12 @@ LexMySQL.o: ../lexers/LexMySQL.cxx ../include/ILexer.h \   ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \   ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \   ../lexlib/LexerModule.h +LexNim.o: ../lexers/LexNim.cxx ../include/ILexer.h \ + ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \ + ../lexlib/StringCopy.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \ + ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \ + ../lexlib/CharacterCategory.h ../lexlib/LexerModule.h \ + ../lexlib/OptionSet.h ../lexlib/DefaultLexer.h  LexNimrod.o: ../lexers/LexNimrod.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \   ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ @@ -612,6 +622,11 @@ LexRust.o: ../lexers/LexRust.cxx ../include/ILexer.h \   ../lexlib/PropSetSimple.h ../lexlib/WordList.h ../lexlib/LexAccessor.h \   ../lexlib/Accessor.h ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \   ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/DefaultLexer.h +LexSAS.o: ../lexers/LexSAS.cxx ../include/ILexer.h \ + ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \ + ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ + ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \ + ../lexlib/LexerModule.h  LexScriptol.o: ../lexers/LexScriptol.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \   ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ @@ -648,6 +663,11 @@ LexSQL.o: ../lexers/LexSQL.cxx ../include/ILexer.h \   ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \   ../lexlib/LexerModule.h ../lexlib/OptionSet.h ../lexlib/SparseState.h \   ../lexlib/DefaultLexer.h +LexStata.o: ../lexers/LexStata.cxx ../include/ILexer.h \ + ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \ + ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ + ../lexlib/StyleContext.h ../lexlib/CharacterSet.h \ + ../lexlib/LexerModule.h  LexSTTXT.o: ../lexers/LexSTTXT.cxx ../include/ILexer.h \   ../include/Sci_Position.h ../include/Scintilla.h ../include/SciLexer.h \   ../lexlib/WordList.h ../lexlib/LexAccessor.h ../lexlib/Accessor.h \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index fd95ddce6..7b850ed5a 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -306,13 +306,11 @@ $(DIR_O)\CallTip.obj: \  	../include/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \ -	../src/IntegerRectangle.h \ -	../lexlib/StringCopy.h \  	../src/Position.h \ +	../src/IntegerRectangle.h \  	../src/CallTip.h  $(DIR_O)\CaseConvert.obj: \  	../src/CaseConvert.cxx \ -	../lexlib/StringCopy.h \  	../src/CaseConvert.h \  	../src/UniConversion.h  $(DIR_O)\CaseFolder.obj: \ @@ -345,6 +343,7 @@ $(DIR_O)\CharacterSet.obj: \  	../lexlib/CharacterSet.h  $(DIR_O)\CharClassify.obj: \  	../src/CharClassify.cxx \ +	../lexlib/CharacterSet.h \  	../src/CharClassify.h  $(DIR_O)\ContractionState.obj: \  	../src/ContractionState.cxx \ @@ -410,7 +409,6 @@ $(DIR_O)\EditModel.obj: \  	../include/Sci_Position.h \  	../include/ILexer.h \  	../include/Scintilla.h \ -	../lexlib/StringCopy.h \  	../src/Position.h \  	../src/UniqueString.h \  	../src/SplitVector.h \ @@ -438,7 +436,6 @@ $(DIR_O)\Editor.obj: \  	../include/Sci_Position.h \  	../include/ILexer.h \  	../include/Scintilla.h \ -	../lexlib/StringCopy.h \  	../lexlib/CharacterSet.h \  	../src/Position.h \  	../src/UniqueString.h \ @@ -463,7 +460,8 @@ $(DIR_O)\Editor.obj: \  	../src/EditModel.h \  	../src/MarginView.h \  	../src/EditView.h \ -	../src/Editor.h +	../src/Editor.h \ +	../src/ElapsedPeriod.h  $(DIR_O)\EditView.obj: \  	../src/EditView.cxx \  	../include/Platform.h \ @@ -471,7 +469,6 @@ $(DIR_O)\EditView.obj: \  	../include/Sci_Position.h \  	../include/ILexer.h \  	../include/Scintilla.h \ -	../lexlib/StringCopy.h \  	../lexlib/CharacterSet.h \  	../src/Position.h \  	../src/IntegerRectangle.h \ @@ -809,7 +806,6 @@ $(DIR_O)\LineMarker.obj: \  	../include/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \ -	../lexlib/StringCopy.h \  	../src/IntegerRectangle.h \  	../src/XPM.h \  	../src/LineMarker.h @@ -820,7 +816,6 @@ $(DIR_O)\MarginView.obj: \  	../include/Sci_Position.h \  	../include/ILexer.h \  	../include/Scintilla.h \ -	../lexlib/StringCopy.h \  	../src/Position.h \  	../src/IntegerRectangle.h \  	../src/UniqueString.h \ @@ -857,7 +852,6 @@ $(DIR_O)\PerLine.obj: \  $(DIR_O)\PlatWin.obj: \  	PlatWin.cxx \  	../include/Platform.h \ -	../lexlib/StringCopy.h \  	../src/XPM.h \  	../src/UniConversion.h \  	../src/DBCS.h \ @@ -984,7 +978,6 @@ $(DIR_O)\ScintillaWin.obj: \  	../include/Sci_Position.h \  	../include/ILexer.h \  	../include/Scintilla.h \ -	../lexlib/StringCopy.h \  	../src/Position.h \  	../src/UniqueString.h \  	../src/SplitVector.h \ @@ -1023,7 +1016,6 @@ $(DIR_O)\ScintillaWinL.obj: \  	../include/Sci_Position.h \  	../include/ILexer.h \  	../include/Scintilla.h \ -	../lexlib/StringCopy.h \  	../src/Position.h \  	../src/UniqueString.h \  	../src/SplitVector.h \ @@ -1093,7 +1085,6 @@ $(DIR_O)\ViewStyle.obj: \  	../src/ViewStyle.h  $(DIR_O)\WordList.obj: \  	../lexlib/WordList.cxx \ -	../lexlib/StringCopy.h \  	../lexlib/WordList.h  $(DIR_O)\XPM.obj: \  	../src/XPM.cxx \ | 
