summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/makefile
diff options
context:
space:
mode:
authorMatthew Cline <zelgadis@sourceforge.net>2009-10-12 06:00:46 -0700
committerMatthew Cline <zelgadis@sourceforge.net>2009-10-12 06:00:46 -0700
commit37a19596827126bc30dde8d49355af9fff6d5631 (patch)
tree7d3e054d34a0c43bda3ccc7344461c9dfdfb2bfb /crawl-ref/source/makefile
parent058810edf9f3e2b7b51d39ec33bab059527d64ae (diff)
downloadcrawl-ref-37a19596827126bc30dde8d49355af9fff6d5631.tar.gz
crawl-ref-37a19596827126bc30dde8d49355af9fff6d5631.zip
* Add -DDEBUG to DEFINES when DEBUG is set.
* Add variable EXTERNAL_FLAGS, for setting compiler flags from the make command line. Trying to do this with EXTRA_FLAGS clobbers the makefile's changes to EXTRA_FLAGS, like adding "-ggdb".
Diffstat (limited to 'crawl-ref/source/makefile')
-rw-r--r--crawl-ref/source/makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile
index ac34d07073..a31bf958e3 100644
--- a/crawl-ref/source/makefile
+++ b/crawl-ref/source/makefile
@@ -336,7 +336,7 @@ endif # MacOS
endif # TILES
CFWARN_L := -Wno-parentheses -Wwrite-strings -Wshadow -pedantic
-CFOTHERS_L = $(EXTRA_FLAGS) $(DEFINES) -DCLUA_BINDINGS $(SDL_CFLAGS)
+CFOTHERS_L = $(EXTERNAL_FLAGS) $(EXTRA_FLAGS) $(DEFINES) -DCLUA_BINDINGS $(SDL_CFLAGS)
#
# Figure out the build settings for this type of build
@@ -385,6 +385,7 @@ DEFINES += -DFULLDEBUG
endif
ifeq ($(DEBUG),y)
EXTRA_FLAGS += -ggdb
+DEFINES += -DDEBUG
endif
ifeq ($(WIZARD),y)
DEFINES += -DWIZARD