diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-12-29 10:08:58 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-12-29 10:08:58 +1100 |
| commit | afe2681f8d6215047232fbf104aec90669d0d947 (patch) | |
| tree | ca4e4f109846eb1610887f0367ea5f81d145d37c | |
| parent | a5c2c7230e5b110cc08b585f1b70294395900de6 (diff) | |
| download | scintilla-mirror-afe2681f8d6215047232fbf104aec90669d0d947.tar.gz | |
Backport: Drop G_THREADS_IMPL_NONE as not implemented in glib since 2011.
Backport of changeset 7847:8ee2f1357c30.
| -rw-r--r-- | gtk/makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gtk/makefile b/gtk/makefile index 189a0030b..62346f207 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -54,24 +54,18 @@ vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../lexlib $(srcdir)/../lexers INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I $(srcdir)/../lexlib CXXBASEFLAGS=$(CXXWARNFLAGS) $(PICFLAGS) -DGTK -DSCI_LEXER $(INCLUDEDIRS) -ifdef NOTHREADS -THREADFLAGS=-DG_THREADS_IMPL_NONE -else -THREADFLAGS= -endif - ifdef NO_CXX11_REGEX REFLAGS=-DNO_CXX11_REGEX endif ifdef DEBUG ifdef CLANG -CTFLAGS=-DDEBUG -g -fsanitize=$(SANITIZE) $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DDEBUG -g -fsanitize=$(SANITIZE) $(CXXBASEFLAGS) else -CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) endif else -CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) endif CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS) |