summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 13 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 6f9aa191f..bb2e71a5e 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,10 @@
# Configuration
#
+# Makefile version tag
+# it checks if the version tag in makefile.config is the same and force update outdated config files
+MAKEFILE_VERSION:=1
+
# CONFIG_WRITER have to be found even for manual configuration
CONFIG_WRITER=makefiledir/Makefile.config_writer
@@ -99,13 +103,8 @@ else
CONFIG_INCLUDED:=1
endif
-# tests if makefile.config contains the new needed SDL-CONFIG
-# it updates makefile.config if needed. Flags like ENABLE_NETWORK are remembered
-ifndef SDL-CONFIG
-ifdef WITH_SDL
-ifndef MANUAL_CONFIG
-#network is enabled by default
-ENABLE_NETWORK:=1
+# updates makefile.config if it's outdated
+ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))
UPDATECONFIG:=upgradeconf
CONFIG_INCLUDED:=
else
@@ -116,8 +115,6 @@ else
SDL-CONFIG:=sdl-config
endif
endif
-endif
-endif
ifndef CONFIG_INCLUDED
-include $(LIB_DETECTION)
@@ -138,6 +135,12 @@ else
WARNING_DISPLAY:=-fno-strict-aliasing
endif
+ifdef SUPRESS_LANG_ERRORS
+ifndef VERBOSE_FILTER
+LANG_ERRORS = >/dev/null 2>&1
+endif
+endif
+
ifdef STATIC
ifndef WIN32
ifndef OSX
@@ -546,7 +549,7 @@ table/strings.h: lang/english.lng
lang/%.lng: lang/%.txt $(STRGEN)
@echo 'Generating $@'; \
- $(STRGEN) $(STRGEN_FLAGS) $< $(VERBOSE_FILTER)
+ $(STRGEN) $(STRGEN_FLAGS) $< $(VERBOSE_FILTER) $(LANG_ERRORS)
winres.o: ttd.rc
windres -o $@ $<