diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-12-29 11:13:51 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-12-29 11:13:51 +1100 |
| commit | b47e1f6f5b2132a0a8c026fba34bc1e78f51a160 (patch) | |
| tree | 673923e75ed9a4ab704ae8c437b54272bc0354b4 /gtk/makefile | |
| parent | 1626fbbff24966c6562942fa23832e5c87019173 (diff) | |
| download | scintilla-mirror-b47e1f6f5b2132a0a8c026fba34bc1e78f51a160.tar.gz | |
Standardize names and order between make files on win32 and gtk.
Diffstat (limited to 'gtk/makefile')
| -rw-r--r-- | gtk/makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/makefile b/gtk/makefile index be280b7e0..2a2eb0123 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -74,7 +74,7 @@ DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG) BASE_FLAGS += $(if $(DEBUG),-g,-Os) CXX_BASE_FLAGS =--std=gnu++17 $(BASE_FLAGS) - +CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS) CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION)) MARSHALLER=scintilla-marshal.o @@ -85,7 +85,7 @@ clean: $(DEL) *.o $(call normalize,$(COMPLIB)) *.plist .cxx.o: - $(CXX) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(CXX_BASE_FLAGS) $(CXXFLAGS) -c $< + $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $< .c.o: $(CC) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(BASE_FLAGS) $(CFLAGS) -w -c $< @@ -97,14 +97,14 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal .list.c: $(GLIB_GENMARSHAL) --body $(GLIB_GENMARSHAL_FLAGS) $< > $@ -LEX_OBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))) - 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 +LEX_OBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(basedir)/lexers/Lex*.cxx))))) + # Required for base Scintilla SRC_OBJS = \ AutoComplete.o \ |