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/scintilla.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/scintilla.mak')
| -rw-r--r-- | win32/scintilla.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index edb0c7de8..1858368da 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -79,8 +79,8 @@ SRC_OBJS=\ $(DIR_O)\CaseConvert.obj \ $(DIR_O)\CaseFolder.obj \ $(DIR_O)\CellBuffer.obj \ - $(DIR_O)\CharacterCategory.obj \ - $(DIR_O)\CharacterSet.obj \ + $(DIR_O)\CharacterCategoryMap.obj \ + $(DIR_O)\CharacterType.obj \ $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ $(DIR_O)\DBCS.obj \ |