[geany/geany] 934b47: scintilla: Remove obsolete flag building Scintilla - Commits

26 May 2016


      Branch:      refs/heads/master
Author:      Colomban Wendling ban@herbesfolles.org
Committer:   Colomban Wendling ban@herbesfolles.org
Date:        Thu, 26 May 2016 17:21:49 UTC
Commit:      934b47158cb0a45457949ebd541ba9457a172721
             https://github.com/geany/geany/commit/934b47158cb0a45457949ebd541ba9457a1727...
Log Message:
-----------
scintilla: Remove obsolete flag building Scintilla
`-DG_THREADS_IMPL_NONE` was a hack, and it has no effect since 3.6.5,
so drop it altogether.
Modified Paths:
--------------
    scintilla/Makefile.am
    scintilla/gtk/makefile.win32
Modified: scintilla/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3,7 +3,7 @@ SUBDIRS = include
noinst_LTLIBRARIES=libscintilla.la
-AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DG_THREADS_IMPL_NONE
+AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER
LEXER_SRCS= \
 lexers/LexAbaqus.cxx \
Modified: scintilla/gtk/makefile.win32
10 lines changed, 2 insertions(+), 8 deletions(-)
===================================================================
@@ -36,17 +36,11 @@ CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(
    -DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \
    -DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL
-ifdef THREADS
-THREADFLAGS=
-else
-THREADFLAGS=-DG_THREADS_IMPL_NONE
-endif
-
ifdef DEBUG
-CTFLAGS=-DDEBUG -g -O0 $(CXXBASEFLAGS) $(THREADFLAGS)
+CTFLAGS=-DDEBUG -g -O0 $(CXXBASEFLAGS)
 else
-CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
+CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
 endif
CFLAGS:=$(CTFLAGS)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    