summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-09-12 07:11:48 +0000
committerrubidium <rubidium@openttd.org>2007-09-12 07:11:48 +0000
commit9e7931f6ea41eea7052e7f40cc841694feed252b (patch)
tree2a8a491bac20ead349d11179cf161aaf43c0cb74 /src
parent7b7c66fb6b604e32dbcfb6104771b33fa6f32dc1 (diff)
downloadopenttd-9e7931f6ea41eea7052e7f40cc841694feed252b.tar.xz
(svn r11089) -Codechange: add revision detection to MSVC.
Diffstat (limited to 'src')
-rw-r--r--src/network/network.cpp12
-rw-r--r--src/network/network.h2
-rw-r--r--src/ottdres.rc.in (renamed from src/ottdres.rc)4
-rw-r--r--src/rev.cpp.in4
4 files changed, 7 insertions, 15 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 0752b0fd8..828fc3ee0 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -3,15 +3,7 @@
#include "../stdafx.h"
#include "network_data.h"
-#if defined(WITH_REV)
- extern const char _openttd_revision[];
-#elif defined(WITH_REV_HACK)
- #define WITH_REV
- extern const char _openttd_revision[] = WITH_REV_HACK;
-#else
- extern const char _openttd_revision[] = NOREV_STRING;
-#endif
-
+extern const char _openttd_revision[];
#ifdef ENABLE_NETWORK
@@ -1463,8 +1455,6 @@ void NetworkShutDown()
/**
* Checks whether the given version string is compatible with our version.
- * It'll check the first NETWORK_REVISION_LENGTH - 1 characters (-1 for '\0')
- * against the current version and the NOREV_STRING.
* @param other the version string to compare to
*/
bool IsNetworkCompatibleVersion(const char *other)
diff --git a/src/network/network.h b/src/network/network.h
index 9907716ac..513c77539 100644
--- a/src/network/network.h
+++ b/src/network/network.h
@@ -3,8 +3,6 @@
#ifndef NETWORK_H
#define NETWORK_H
-#define NOREV_STRING "norev000"
-
#ifdef ENABLE_NETWORK
#include "../player.h"
diff --git a/src/ottdres.rc b/src/ottdres.rc.in
index efb6864f1..a75294fe1 100644
--- a/src/ottdres.rc
+++ b/src/ottdres.rc.in
@@ -84,14 +84,14 @@ BEGIN
VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
VALUE "CompanyName", "OpenTTD Development Team\0"
VALUE "FileDescription", "OpenTTD\0"
- VALUE "FileVersion", "Development Version\0"
+ VALUE "FileVersion", "Development @@VERSION@@\0"
VALUE "InternalName", "openttd\0"
VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2007. All Rights Reserved.\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "openttd.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "OpenTTD\0"
- VALUE "ProductVersion", "Development Version\0"
+ VALUE "ProductVersion", "Development @@VERSION@@\0"
VALUE "SpecialBuild", "-\0"
END
END
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
new file mode 100644
index 000000000..badec3c0d
--- /dev/null
+++ b/src/rev.cpp.in
@@ -0,0 +1,4 @@
+extern const char _openttd_revision[] = "@@VERSION@@";
+#ifdef __MORPHOS__
+extern const char morphos_versions_tag[] = "\\0$VER: OpenTTD @@VERSION@@ (@@DATE@@) OpenTTD Team [MorphOS, PowerPC]";
+#endif