diff options
| author | bjarni <bjarni@openttd.org> | 2004-11-08 21:11:52 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2004-11-08 21:11:52 +0000 |
| commit | 72880f2dad5e322eae65fbd66787c26e710802e2 (patch) | |
| tree | add5e5ee1343e05a60eaede175f68d5ff314977c | |
| parent | 2cf5b77d0b6497add20c8135e75c5a3b583f3455 (diff) | |
| download | openttd-72880f2dad5e322eae65fbd66787c26e710802e2.tar.xz | |
(svn r530) Makefile: added ability to switch asserts on and off
Updated makefile.config to versiontag 2 for autoupdating purposes
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | makefiledir/Makefile.config_writer | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -109,7 +109,7 @@ # Makefile version tag # it checks if the version tag in makefile.config is the same and force update outdated config files -MAKEFILE_VERSION:=1 +MAKEFILE_VERSION:=2 # CONFIG_WRITER have to be found even for manual configuration CONFIG_WRITER=makefiledir/Makefile.config_writer @@ -404,6 +404,10 @@ endif endif endif +# enables/disables assert() +ifndef ENABLE_ASSERTS +CFLAGS += -DNDEBUG +endif ifdef TRANSLATOR STRGEN_FLAGS=-t diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index e2c698e99..0c3d669d3 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -27,6 +27,10 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,SUPRESS_LANG_ERRORS:=$(SUPRESS_LANG_ERRORS)) $(call CONFIG_LINE,) + $(call CONFIG_LINE,\# Enable asserts) + $(call CONFIG_LINE,ENABLE_ASSERTS:=$(ENABLE_ASSERTS)) + $(call CONFIG_LINE,) + $(call CONFIG_LINE,\# See Makefile for details on these paths) $(call CONFIG_LINE,\# Folders should not end with /) $(call CONFIG_LINE,INSTALL:=$(INSTALL)) |