aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar mitchell <70453897+667e-11@users.noreply.github.com>2016-06-05 12:13:47 -0400
committerGravatar mitchell <70453897+667e-11@users.noreply.github.com>2016-06-05 12:13:47 -0400
commit5bbef174e4d6be4cd88ee765913befc07075deaa (patch)
tree7bd353673392b0d6b9b2c203d9df3f95b94b2c5f
parentfd9215ce1251717d7adaf8361801749a4c7dc179 (diff)
Updated to Scintilla 3.6.6; src/Makefile
-rw-r--r--src/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index 4eb2370d..e0a4342e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -96,7 +96,7 @@ endif
# Scintilla.
-sci_flags = -pedantic $(plat_flag) -DSCI_LEXER -DNDEBUG -DG_THREADS_IMPL_NONE \
+sci_flags = -pedantic $(plat_flag) -DSCI_LEXER -DNDEBUG -DNO_CXX11_REGEX \
-Iscintilla/include -Iscintilla/src -Iscintilla/lexlib -Wall
sci_objs = AutoComplete.o CallTip.o CaseConvert.o CaseFolder.o Catalogue.o \
@@ -296,7 +296,7 @@ osxapp_libs = libatk-1.0.0.dylib libcairo.2.dylib libexpat.1.dylib \
libffi.5.dylib libfontconfig.1.dylib libfreetype.6.dylib \
libgdk_pixbuf-2.0.0.dylib libgdk-quartz-2.0.0.dylib \
libgio-2.0.0.dylib libglib-2.0.0.dylib libgmodule-2.0.0.dylib \
- libgobject-2.0.0.dylib libgthread-2.0.0.dylib \
+ libgobject-2.0.0.dylib \
libgtkmacintegration.2.dylib libgtk-quartz-2.0.0.dylib \
libintl.8.dylib libpango-1.0.0.dylib libpangocairo-1.0.0.dylib \
libpangoft2-1.0.0.dylib libpixman-1.0.dylib libpng14.14.dylib \
@@ -379,7 +379,7 @@ else
lspawn_url = http://foicica.com/hg/lspawn/archive/tip.zip
endif
-scintilla_tgz = scintilla365.tgz
+scintilla_tgz = scintilla366.tgz
scinterm_zip = scinterm_1.8.zip
scintillua_zip = scintillua_3.6.5-1.zip
lua_tgz = lua-5.3.2.tar.gz