Merge remote-tracking branch 'lenormf/remove-pedantic-granularity'
This commit is contained in:
commit
26c957933f
|
@ -12,12 +12,11 @@
|
|||
|
||||
debug = yes
|
||||
static = no
|
||||
pedantic = yes
|
||||
|
||||
suffix = .opt
|
||||
|
||||
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 =
|
||||
LDFLAGS =
|
||||
LIBS =
|
||||
|
@ -35,10 +34,6 @@ ifeq ($(static),yes)
|
|||
LDFLAGS += -static -pthread
|
||||
endif
|
||||
|
||||
ifeq ($(pedantic),yes)
|
||||
CXXFLAGS += -pedantic
|
||||
endif
|
||||
|
||||
ifeq (@(TUP_PLATFORM),macosx)
|
||||
LIBS += -lncurses -lboost_regex-mt
|
||||
CPPFLAGS += -I/usr/local/opt/ncurses/include
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
debug ?= yes
|
||||
static ?= no
|
||||
pedantic ?= yes
|
||||
|
||||
ifeq ($(debug),yes)
|
||||
CPPFLAGS += -DKAK_DEBUG
|
||||
|
@ -14,10 +13,6 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(pedantic),yes)
|
||||
CXXFLAGS += -pedantic
|
||||
endif
|
||||
|
||||
sources := $(wildcard *.cc)
|
||||
objects := $(addprefix ., $(sources:.cc=$(suffix).o))
|
||||
deps := $(addprefix ., $(sources:.cc=$(suffix).d))
|
||||
|
@ -64,7 +59,7 @@ ifeq ($(static),yes)
|
|||
LDFLAGS += -static -pthread
|
||||
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
|
||||
kak : $(objects)
|
||||
|
|
Loading…
Reference in New Issue
Block a user