diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-04-17 15:29:20 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-04-17 15:29:20 +1000 |
| commit | 9e2bd8b981c5d6891b7e0bf9418fd70aceff9602 (patch) | |
| tree | 5c46fd80e54c2fe5bfa1f5e006cfa065850a0811 /gtk | |
| parent | 8c45e7db05d76de60d214148a69b5ba927b704a1 (diff) | |
| download | scintilla-mirror-9e2bd8b981c5d6891b7e0bf9418fd70aceff9602.tar.gz | |
Making dependencies now requires Python 3.6+.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/DepGen.py | 6 | ||||
| -rw-r--r-- | gtk/deps.mak | 2 | ||||
| -rw-r--r-- | gtk/makefile | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/gtk/DepGen.py b/gtk/DepGen.py index 4feea8a9c..39d9bd358 100644 --- a/gtk/DepGen.py +++ b/gtk/DepGen.py @@ -1,8 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # DepGen.py - produce a make dependencies file for Scintilla # Copyright 2019 by Neil Hodgson <neilh@scintilla.org> # The License.txt file describes the conditions under which this software may be distributed. -# Requires Python 2.7 or later +# Requires Python 3.6 or later import sys @@ -10,7 +10,7 @@ sys.path.append("..") from scripts import Dependencies -topComment = "# Created by DepGen.py. To recreate, run 'python DepGen.py'.\n" +topComment = "# Created by DepGen.py. To recreate, run DepGen.py.\n" def Generate(): sources = ["../src/*.cxx", "../lexlib/*.cxx", "../lexers/*.cxx"] diff --git a/gtk/deps.mak b/gtk/deps.mak index 6ba5eff2e..f6d45de7b 100644 --- a/gtk/deps.mak +++ b/gtk/deps.mak @@ -1,4 +1,4 @@ -# Created by DepGen.py. To recreate, run 'python DepGen.py'. +# Created by DepGen.py. To recreate, run DepGen.py. PlatGTK.o: \ PlatGTK.cxx \ ../include/Platform.h \ diff --git a/gtk/makefile b/gtk/makefile index cde17ea80..00f902517 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -52,6 +52,8 @@ endif # Take care of changing Unix style '/' directory separator to '\' on Windows normalize = $(if $(windir),$(subst /,\,$1),$1) +PYTHON = $(if $(windir),pyw,python3) + ifdef windir CC = gcc DEL = del /q @@ -103,7 +105,7 @@ analyze: clang --analyze $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(CXX_BASE_FLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(basedir)/src/*.cxx $(basedir)/lexlib/*.cxx $(basedir)/lexers/*.cxx depend deps.mak: - python DepGen.py + $(PYTHON) DepGen.py LEX_OBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(basedir)/lexers/Lex*.cxx))))) |