xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lenormf/remove-pedantic-granularity'

Browse Source
This commit is contained in:
Maxime Coste 2017-01-14 14:48:53 +00:00
commit 26c957933f
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/Tupfile
View File

@ -12,12 +12,11 @@
debug = yes debug = yes
static = no static = no
pedantic = yes
suffix = .opt suffix = .opt
CXX = g++ CXX = g++
CXXFLAGS = -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address CXXFLAGS = -pedantic -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address
CPPFLAGS = CPPFLAGS =
LDFLAGS = LDFLAGS =
LIBS = LIBS =
@ -35,10 +34,6 @@ ifeq ($(static),yes)
LDFLAGS += -static -pthread LDFLAGS += -static -pthread
endif endif
ifeq ($(pedantic),yes)
CXXFLAGS += -pedantic
endif
ifeq (@(TUP_PLATFORM),macosx) ifeq (@(TUP_PLATFORM),macosx)
LIBS += -lncurses -lboost_regex-mt LIBS += -lncurses -lboost_regex-mt
CPPFLAGS += -I/usr/local/opt/ncurses/include CPPFLAGS += -I/usr/local/opt/ncurses/include

7
src/Makefile
View File

@ -1,6 +1,5 @@
debug ?= yes debug ?= yes
static ?= no static ?= no
pedantic ?= yes
ifeq ($(debug),yes) ifeq ($(debug),yes)
CPPFLAGS += -DKAK_DEBUG CPPFLAGS += -DKAK_DEBUG
@ -14,10 +13,6 @@ else
endif endif
endif endif
ifeq ($(pedantic),yes)
CXXFLAGS += -pedantic
endif
sources := $(wildcard *.cc) sources := $(wildcard *.cc)
objects := $(addprefix ., $(sources:.cc=$(suffix).o)) objects := $(addprefix ., $(sources:.cc=$(suffix).o))
deps := $(addprefix ., $(sources:.cc=$(suffix).d)) deps := $(addprefix ., $(sources:.cc=$(suffix).d))
@ -64,7 +59,7 @@ ifeq ($(static),yes)
LDFLAGS += -static -pthread LDFLAGS += -static -pthread
endif endif
CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address CXXFLAGS += -pedantic -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address
all : kak all : kak
kak : $(objects) kak : $(objects)