From 52abb70c4457a9b01e56cbf363c029c5661623d3 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 17 Apr 2007 20:19:44 +0000 Subject: [PATCH] (svn r9661) -Release 0.5.1-RC3. --- Makefile | 9 +-------- network.c | 2 +- openttd.vcproj | 4 ++-- openttd_vs80.vcproj | 8 ++++---- ottdres.rc | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 0a7337b3fc..354081c6fa 100644 --- a/Makefile +++ b/Makefile @@ -268,14 +268,7 @@ ENDIAN_CHECK=endian_check$(EXE) STRGEN=strgen/strgen$(EXE) OSXAPP="OpenTTD.app" -ifdef RELEASE -REV:=$(RELEASE) -else -ifeq ($(shell if test -d .svn; then echo 1; fi), 1) -REV_MODIFIED := $(shell svnversion . | sed -n 's/.*\(M\).*/\1/p' ) -REV := $(shell LC_ALL=C svn info | awk '/^URL:.*branch/ { BRANCH="-"a[split($$2, a, "/")] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') -endif -endif +REV := 0.5.1-RC3 # define flag to use for -lrt (some OSes overwrites this later for compatibility) ifndef LRT diff --git a/network.c b/network.c index 7e1de138ac..16e1e4708b 100644 --- a/network.c +++ b/network.c @@ -7,7 +7,7 @@ extern const char _openttd_revision[]; #elif defined(WITH_REV_HACK) #define WITH_REV - const char _openttd_revision[] = WITH_REV_HACK; + const char _openttd_revision[] = "0.5.1-RC3"; #else const char _openttd_revision[] = NOREV_STRING; #endif diff --git a/openttd.vcproj b/openttd.vcproj index 932a5d4e41..58cab20ebd 100644 --- a/openttd.vcproj +++ b/openttd.vcproj @@ -28,7 +28,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="TRUE" OptimizeForProcessor="1" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK" StringPooling="TRUE" ExceptionHandling="TRUE" RuntimeLibrary="0" @@ -101,7 +101,7 @@