diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-02-28 17:51:53 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-02-28 17:51:53 -0500 |
| commit | 228ffe41b2a563d7a797b6e0413e7f9a2ef96136 (patch) | |
| tree | 9631c4d50a6b6fef8f64c8c0868ce354b67eef0d | |
| parent | 5650af67b19e8d438dfe042470d80478b04f8c20 (diff) | |
| download | textadept-228ffe41b2a563d7a797b6e0413e7f9a2ef96136.tar.gz textadept-228ffe41b2a563d7a797b6e0413e7f9a2ef96136.zip | |
More Makefile tweaks.
| -rw-r--r-- | src/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index a14ed805..ebbc6b29 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,6 +2,7 @@ CC = gcc CXX = g++ +MAKE = make ifeq (win, $(findstring win, $(MAKECMDGOALS))) # Cross-compile for Win32. CROSS = i686-w64-mingw32- @@ -14,7 +15,6 @@ ifeq (win, $(findstring win, $(MAKECMDGOALS))) LDFLAGS += -liconv endif WINDRES = windres - MAKE = make ifeq (, $(findstring curses, $(MAKECMDGOALS))) plat_flag = -DGTK GTK_CFLAGS = $(shell PKG_CONFIG_PATH=`pwd`/win32gtk/lib/pkgconfig \ @@ -39,7 +39,6 @@ else ifeq (osx, $(findstring osx, $(MAKECMDGOALS))) CXXFLAGS = -m32 -arch i386 -mdynamic-no-pic -mmacosx-version-min=10.5 -Os LUA_CFLAGS = -DLUA_USE_MACOSX LDFLAGS = -liconv -rdynamic - MAKE = make ifeq (, $(findstring curses, $(MAKECMDGOALS))) plat_flag = -DGTK GTK_CFLAGS = $(shell PKG_CONFIG_PATH=`pwd`/gtkosx/lib/pkgconfig \ @@ -65,7 +64,6 @@ else LDFLAGS = -rdynamic -Wl,--retain-symbols-file -Wl,lua.sym ifeq (Linux, $(shell uname -s)) LDFLAGS += -ldl - MAKE = make else CC=cc CXX=c++ @@ -127,8 +125,8 @@ lexlpeg_objs = LexLPeg.o LexLPegjit.o LexLPeg-curses.o LexLPegjit-curses.o # Textadept. -ta_flags = -std=c99 -pedantic $(plat_flag) -Iscintilla/include -Igtdialog -W \ - -Wall -Wno-unused +ta_flags = -std=c99 -pedantic $(plat_flag) -Iscintilla/include -Igtdialog \ + -Wall -Wextra -Wno-unused textadept_gtk_objs = textadept.o textadeptjit.o textadept_curses_objs = textadept-curses.o textadeptjit-curses.o @@ -209,7 +207,7 @@ textadept_rc.o: textadept.rc ; $(CROSS)$(WINDRES) $< $@ # Target-specific variables. -$(lexlpeg_objs): sci_flags += -DLPEG_LEXER -DNO_SCITE -Wno-long-long +$(lexlpeg_objs): sci_flags += -DLPEG_LEXER -DNO_SCITE 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 |