mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-06 22:28:56 +00:00
(svn r531) Makefile: made asserts enabled by default
RELEASE disables asserts unless ENABLE_ASSERTS(not in makefile.config) is set makefile.config version 3
This commit is contained in:
parent
72880f2dad
commit
b78bbf80bf
9
Makefile
9
Makefile
@ -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:=2
|
||||
MAKEFILE_VERSION:=3
|
||||
|
||||
# CONFIG_WRITER have to be found even for manual configuration
|
||||
CONFIG_WRITER=makefiledir/Makefile.config_writer
|
||||
@ -405,9 +405,16 @@ endif
|
||||
endif
|
||||
|
||||
# enables/disables assert()
|
||||
ifdef DISABLE_ASSERTS
|
||||
CFLAGS += -DNDEBUG
|
||||
endif
|
||||
|
||||
# automatically disables asserts for release
|
||||
ifdef RELEASE
|
||||
ifndef ENABLE_ASSERTS
|
||||
CFLAGS += -DNDEBUG
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef TRANSLATOR
|
||||
STRGEN_FLAGS=-t
|
||||
|
@ -27,8 +27,8 @@ $(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,\# Disable asserts. Leave them on for easier bug finding)
|
||||
$(call CONFIG_LINE,DISABLE_ASSERTS:=$(DISABLE_ASSERTS))
|
||||
$(call CONFIG_LINE,)
|
||||
|
||||
$(call CONFIG_LINE,\# See Makefile for details on these paths)
|
||||
|
Loading…
Reference in New Issue
Block a user