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/nmdeps.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/nmdeps.mak')
| -rw-r--r-- | win32/nmdeps.mak | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak index b831d6add..0f7f0fcbb 100644 --- a/win32/nmdeps.mak +++ b/win32/nmdeps.mak @@ -29,7 +29,7 @@ $(DIR_O)/ScintillaWin.obj: \ ../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 @@ $(DIR_O)/AutoComplete.obj: \ ../src/Platform.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ - ../src/CharacterSet.h \ + ../src/CharacterType.h \ ../src/Position.h \ ../src/AutoComplete.h $(DIR_O)/CallTip.obj: \ @@ -98,15 +98,15 @@ $(DIR_O)/CellBuffer.obj: \ ../src/Partitioning.h \ ../src/CellBuffer.h \ ../src/UniConversion.h -$(DIR_O)/CharacterCategory.obj: \ - ../src/CharacterCategory.cxx \ - ../src/CharacterCategory.h -$(DIR_O)/CharacterSet.obj: \ - ../src/CharacterSet.cxx \ - ../src/CharacterSet.h +$(DIR_O)/CharacterCategoryMap.obj: \ + ../src/CharacterCategoryMap.cxx \ + ../src/CharacterCategoryMap.h +$(DIR_O)/CharacterType.obj: \ + ../src/CharacterType.cxx \ + ../src/CharacterType.h $(DIR_O)/CharClassify.obj: \ ../src/CharClassify.cxx \ - ../src/CharacterSet.h \ + ../src/CharacterType.h \ ../src/CharClassify.h $(DIR_O)/ContractionState.obj: \ ../src/ContractionState.cxx \ @@ -138,8 +138,8 @@ $(DIR_O)/Document.obj: \ ../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 @@ $(DIR_O)/EditModel.obj: \ ../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 @@ $(DIR_O)/Editor.obj: \ ../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 @@ $(DIR_O)/EditView.obj: \ ../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 @@ $(DIR_O)/MarginView.obj: \ ../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 @@ $(DIR_O)/PositionCache.obj: \ ../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 @@ $(DIR_O)/ScintillaBase.obj: \ ../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 @@ $(DIR_O)/ScintillaBaseL.obj: \ ../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 \ |