diff options
| author | mitchell <unknown> | 2020-01-05 17:10:23 -0500 |
|---|---|---|
| committer | mitchell <unknown> | 2020-01-05 17:10:23 -0500 |
| commit | ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601 (patch) | |
| tree | a2469638126f8a958ad6e86b6ee6b2b7eedaf036 /win32 | |
| parent | 51c270affe753fcfae24887ee940e8061c631d7d (diff) | |
| download | scintilla-mirror-ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601.tar.gz | |
Synchronizing LongTerm3 with default.
Ideally this covers anything missed during the backport process.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/DepGen.py | 4 | ||||
| -rw-r--r-- | win32/makefile | 3 | ||||
| -rw-r--r-- | win32/scintilla.mak | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/win32/DepGen.py b/win32/DepGen.py index ce40d1a82..c255574b0 100644 --- a/win32/DepGen.py +++ b/win32/DepGen.py @@ -6,9 +6,9 @@ import sys -sys.path.append("../") +sys.path.append("..") -import scripts.Dependencies as Dependencies +from scripts import Dependencies topComment = "# Created by DepGen.py. To recreate, run 'python DepGen.py'.\n" diff --git a/win32/makefile b/win32/makefile index 71be978c7..1b5ce451b 100644 --- a/win32/makefile +++ b/win32/makefile @@ -2,8 +2,7 @@ # @file makefile # Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org> # The License.txt file describes the conditions under which this software may be distributed. -# This makefile assumes the MinGW32 version of GCC 4.8+ is used and changes will -# be needed to use other compilers. +# This makefile assumes Mingw GCC 4.8+ is used and changes will be needed to use other compilers. # Clang 3.4+ can be used with CLANG=1 on command line. .PHONY: all clean analyze depend diff --git a/win32/scintilla.mak b/win32/scintilla.mak index fde975802..d5c3a2a9e 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -231,7 +231,7 @@ LEXLIB_OBJS = \ $(DIR_O)\LexerModule.obj \ $(DIR_O)\LexerSimple.obj \ $(DIR_O)\StyleContext.obj \ - $(DIR_O)\WordList.obj \ + $(DIR_O)\WordList.obj # Required by libraries and DLLs that include lexing SCILEX_OBJS = \ @@ -291,3 +291,4 @@ $(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx !INCLUDE nmdeps.mak !ENDIF + |