diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-04-27 10:04:57 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-04-27 10:04:57 +1000 |
| commit | 13b6f88d9b4710e1c51b36a97c3b45a6441a7820 (patch) | |
| tree | a8f7b3fa0e91986f4d0a8125a705df771ddb5f83 /win32/deps.mak | |
| parent | dd48a3b8b049ab42ac16108b428e947135f82877 (diff) | |
| download | scintilla-mirror-13b6f88d9b4710e1c51b36a97c3b45a6441a7820.tar.gz | |
Rename CharacterSet and CharacterCategory modules in Scintilla to CharacterType
and CharacterCategoryMap to avoid clashes with Lexilla when building an
executable that includes both.
Diffstat (limited to 'win32/deps.mak')
| -rw-r--r-- | win32/deps.mak | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/win32/deps.mak b/win32/deps.mak index 3fd1b4765..d9f44d995 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -29,7 +29,7 @@ ScintillaWin.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -68,7 +68,7 @@ AutoComplete.o: \ ../src/Platform.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ - ../src/CharacterSet.h \ + ../src/CharacterType.h \ ../src/Position.h \ ../src/AutoComplete.h CallTip.o: \ @@ -98,15 +98,15 @@ CellBuffer.o: \ ../src/Partitioning.h \ ../src/CellBuffer.h \ ../src/UniConversion.h -CharacterCategory.o: \ - ../src/CharacterCategory.cxx \ - ../src/CharacterCategory.h -CharacterSet.o: \ - ../src/CharacterSet.cxx \ - ../src/CharacterSet.h +CharacterCategoryMap.o: \ + ../src/CharacterCategoryMap.cxx \ + ../src/CharacterCategoryMap.h +CharacterType.o: \ + ../src/CharacterType.cxx \ + ../src/CharacterType.h CharClassify.o: \ ../src/CharClassify.cxx \ - ../src/CharacterSet.h \ + ../src/CharacterType.h \ ../src/CharClassify.h ContractionState.o: \ ../src/ContractionState.cxx \ @@ -138,8 +138,8 @@ Document.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterSet.h \ - ../src/CharacterCategory.h \ + ../src/CharacterType.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/SplitVector.h \ ../src/Partitioning.h \ @@ -162,7 +162,7 @@ EditModel.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -192,8 +192,8 @@ Editor.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterSet.h \ - ../src/CharacterCategory.h \ + ../src/CharacterType.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -228,8 +228,8 @@ EditView.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterSet.h \ - ../src/CharacterCategory.h \ + ../src/CharacterType.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -291,7 +291,7 @@ MarginView.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -335,7 +335,7 @@ PositionCache.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -378,7 +378,7 @@ ScintillaBase.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -413,7 +413,7 @@ ScintillaBaseL.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ |