diff options
| author |  mitchell <70453897+667e-11@users.noreply.github.com> | 2015-03-13 09:46:16 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2015-03-13 09:46:16 -0400 |
| commit | 6b37358e5c6efec74c17fc1871d25aa019629f29 (patch) | |
| tree | 4de3b3a4a13b0d221cc1b5df0e42c928d0674abc /src | |
| parent | 858f79eea1057cc52868f23dd1390c9c19016755 (diff) | |
Fixed build flags; src/Makefile
These flags were causing the nightly builds to fail.
Lua 5.3's 64-bit integers use "long long", which is not supported by c++98.
However, mingw32 has issues with -std=c++0x and apple-darwin does not support it
at all. Instead, resort to disabling the "long long" warning.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 651fa9a5..c4395715 100644 --- a/src/Makefile +++ b/src/Makefile @@ -62,7 +62,7 @@ else ifeq (osx, $(findstring osx, $(MAKECMDGOALS))) else # Build for Linux/BSD. CFLAGS = -Os - CXXFLAGS = -Os + CXXFLAGS = -Os -std=c++0x LUA_CFLAGS = -DLUA_USE_LINUX LDFLAGS = -rdynamic -Wl,--retain-symbols-file -Wl,lua.sym ifeq (Linux, $(shell uname -s)) @@ -98,9 +98,8 @@ endif # Scintilla. -sci_flags = -std=c++0x -pedantic $(plat_flag) -DSCI_LEXER -DNDEBUG \ - -DG_THREADS_IMPL_NONE -Iscintilla/include -Iscintilla/src \ - -Iscintilla/lexlib -Wall +sci_flags = -pedantic $(plat_flag) -DSCI_LEXER -DNDEBUG -DG_THREADS_IMPL_NONE \ + -Iscintilla/include -Iscintilla/src -Iscintilla/lexlib -Wall sci_objs = AutoComplete.o CallTip.o CaseConvert.o CaseFolder.o Catalogue.o \ CellBuffer.o CharClassify.o ContractionState.o Decoration.o \ @@ -195,7 +194,7 @@ textadept_rc.o: textadept.rc ; $(CROSS)$(WINDRES) $< $@ # Target-specific variables. -$(lexlpeg_objs): sci_flags += -DLPEG_LEXER -DNO_SCITE +$(lexlpeg_objs): sci_flags += -DLPEG_LEXER -DNO_SCITE -Wno-long-long LexLPeg-curses.o LexLPegjit-curses.o: sci_flags += -DCURSES $(CURSES_CFLAGS) lua_dep_objs = LexLPeg.o LexLPeg-curses.o textadept.o textadept-curses.o \ $(lua_objs) $(lua_lib_objs) lspawn.o lspawn-curses.o |