Skip to content

Commit

Permalink
Merge pull request #254 from Szunti/trunk
Browse files Browse the repository at this point in the history
Prettify makefile output.
  • Loading branch information
galegosimpatico authored Apr 9, 2018
2 parents ccbdfeb + 9114996 commit bd77a29
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,28 @@ OPTIMIZE?=yes
USE_LUA?=yes
USE_BOX2D?=yes
CCACHE?=ccache
USE_CCACHE?=$(shell which $(CCACHE) 2>&1 > /dev/null && echo yes)
USE_CCACHE?=$(shell which $(CCACHE) > /dev/null 2>&1 && echo yes)
ifneq ($(USE_CCACHE),yes)
CCACHE=
USE_CCACHE=no
endif

SANITIZE_ADDRESS?=
ifneq ($(SANITIZE_ADDRESS), yes)
SANITIZE_ADDRESS=
SANITIZE_ADDRESS=no
endif

SANITIZE_UNDEFINED?=
ifneq ($(SANITIZE_UNDEFINED), yes)
SANITIZE_UNDEFINED=
SANITIZE_UNDEFINED=no
endif

ifeq ($(OPTIMIZE),yes)
BASE_CXXFLAGS += -O2
endif

ifneq ($(USE_LUA), yes)
USE_LUA=
USE_LUA=no
endif

BASE_CXXFLAGS += -Wall -Werror
Expand Down Expand Up @@ -130,13 +131,17 @@ ifeq ($(USE_LIBVPX),yes)
BASE_CXXFLAGS += -DUSE_LIBVPX
INC += $(shell pkg-config --cflags vpx)
LIBS += $(shell pkg-config --libs vpx)
else
USE_LIBVPX=no
endif
# couchbase check
USE_DB_CLIENT?=no
ifeq ($(USE_DB_CLIENT),yes)
BASE_CXXFLAGS += -DUSE_DBCLIENT
LIBS += -lcouchbase
else
USE_DB_CLIENT=no
endif
# cairo check
Expand All @@ -145,6 +150,8 @@ ifeq ($(USE_SVG),yes)
BASE_CXXFLAGS += -DUSE_SVG
INC += $(shell pkg-config --cflags cairo)
LIBS += $(shell pkg-config --libs cairo)
else
USE_SVG=no
endif
MODULES := kre svg Box2D tiled hex xhtml
Expand Down

0 comments on commit bd77a29

Please sign in to comment.