mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r531) Makefile: made asserts enabled by default 

RELEASE disables asserts unless ENABLE_ASSERTS(not in makefile.config) is set
makefile.config version 3
release/0.4.5
bjarni 2004-11-08 21:24:48 +00:00
parent 72880f2dad
commit b78bbf80bf
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -109,7 +109,7 @@
# Makefile version tag # Makefile version tag
# it checks if the version tag in makefile.config is the same and force update outdated config files # it checks if the version tag in makefile.config is the same and force update outdated config files
MAKEFILE_VERSION:=2 MAKEFILE_VERSION:=3
# CONFIG_WRITER have to be found even for manual configuration # CONFIG_WRITER have to be found even for manual configuration
CONFIG_WRITER=makefiledir/Makefile.config_writer CONFIG_WRITER=makefiledir/Makefile.config_writer
@ -405,9 +405,16 @@ endif
endif endif
# enables/disables assert() # enables/disables assert()
ifdef DISABLE_ASSERTS
CFLAGS += -DNDEBUG
endif
# automatically disables asserts for release
ifdef RELEASE
ifndef ENABLE_ASSERTS ifndef ENABLE_ASSERTS
CFLAGS += -DNDEBUG CFLAGS += -DNDEBUG
endif endif
endif
ifdef TRANSLATOR ifdef TRANSLATOR
STRGEN_FLAGS=-t STRGEN_FLAGS=-t

4
makefiledir/Makefile.config_writer
View File

@ -27,8 +27,8 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,SUPRESS_LANG_ERRORS:=$(SUPRESS_LANG_ERRORS)) $(call CONFIG_LINE,SUPRESS_LANG_ERRORS:=$(SUPRESS_LANG_ERRORS))
$(call CONFIG_LINE,) $(call CONFIG_LINE,)
$(call CONFIG_LINE,\# Enable asserts) $(call CONFIG_LINE,\# Disable asserts. Leave them on for easier bug finding)
$(call CONFIG_LINE,ENABLE_ASSERTS:=$(ENABLE_ASSERTS)) $(call CONFIG_LINE,DISABLE_ASSERTS:=$(DISABLE_ASSERTS))
$(call CONFIG_LINE,) $(call CONFIG_LINE,)
$(call CONFIG_LINE,\# See Makefile for details on these paths) $(call CONFIG_LINE,\# See Makefile for details on these paths)