mirror of https://github.com/OpenTTD/OpenTTD
(svn r530) Makefile: added ability to switch asserts on and off
Updated makefile.config to versiontag 2 for autoupdating purposesrelease/0.4.5
parent
2cf5b77d0b
commit
72880f2dad
6
Makefile
6
Makefile
|
@ -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:=1
|
MAKEFILE_VERSION:=2
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -404,6 +404,10 @@ endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# enables/disables assert()
|
||||||
|
ifndef ENABLE_ASSERTS
|
||||||
|
CFLAGS += -DNDEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef TRANSLATOR
|
ifdef TRANSLATOR
|
||||||
STRGEN_FLAGS=-t
|
STRGEN_FLAGS=-t
|
||||||
|
|
|
@ -27,6 +27,10 @@ $(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,ENABLE_ASSERTS:=$(ENABLE_ASSERTS))
|
||||||
|
$(call CONFIG_LINE,)
|
||||||
|
|
||||||
$(call CONFIG_LINE,\# See Makefile for details on these paths)
|
$(call CONFIG_LINE,\# See Makefile for details on these paths)
|
||||||
$(call CONFIG_LINE,\# Folders should not end with /)
|
$(call CONFIG_LINE,\# Folders should not end with /)
|
||||||
$(call CONFIG_LINE,INSTALL:=$(INSTALL))
|
$(call CONFIG_LINE,INSTALL:=$(INSTALL))
|
||||||
|
|
Loading…
Reference in New Issue