diff options
| author | rubidium <rubidium@openttd.org> | 2012-01-17 17:27:38 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2012-01-17 17:27:38 +0000 |
| commit | 4f62472fd98145ca9d4e479dfbd1f2fb0b4ed524 (patch) | |
| tree | a5e1f9426fec0d4518ad112f0511edcf5caeb38e /Makefile.src.in | |
| parent | 2c998051173484aeac026de21a50177313908d37 (diff) | |
| download | openttd-4f62472fd98145ca9d4e479dfbd1f2fb0b4ed524.tar.xz | |
(svn r23817) -Fix [FS#4962]: desync due to different NewGRF version. So reduce the chance that it happens significantly with betas/RCs/nightlies by doing the same as is done for stable releases: check the NewGRF version of server vs client.
Previously this check was not done for nightlies/betas/RCs due to missing versioning information in the source tarballs, but they have that for a while now. So just force the NewGRF version check for all versions, and remove the broken --revision configure option
Diffstat (limited to 'Makefile.src.in')
| -rw-r--r-- | Makefile.src.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Makefile.src.in b/Makefile.src.in index 2bb0da31a..572ae11f0 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -37,7 +37,6 @@ STAGE = !!STAGE!! MAKEDEPEND = !!MAKEDEPEND!! CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!! SORT = !!SORT!! -REVISION = !!REVISION!! AWK = !!AWK!! CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!! CONFIG_CACHE_LINKER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!! @@ -94,15 +93,9 @@ $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STR VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh") MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d' ') -ifdef REVISION -# Use specified revision (which should be of the form "r000"). -REV := $(REVISION) -REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g") -else # Use autodetected revisions REV := $(shell echo "$(VERSIONS)" | cut -f 1 -d' ') REV_NR := $(shell echo "$(VERSIONS)" | cut -f 2 -d' ') -endif # Make sure we have something in REV and REV_NR ifeq ($(REV),) |