aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2010-06-24 22:33:49 +0000
committerJohannes Schickel2010-06-24 22:33:49 +0000
commitd783ca972abee9702e6abf31f13188fc59d7d32d (patch)
tree9657fcd4bb3759d9b46e45abd261e5799e8cce63
parente7f3ddf2dbb379ee41d82347f928d5f8d6f0e60d (diff)
downloadscummvm-rg350-d783ca972abee9702e6abf31f13188fc59d7d32d.tar.gz
scummvm-rg350-d783ca972abee9702e6abf31f13188fc59d7d32d.tar.bz2
scummvm-rg350-d783ca972abee9702e6abf31f13188fc59d7d32d.zip
Disable addition of "SCUMMVM_SVN_REVISION" to the version string, in case --enable-release was specified on configure run.
svn-id: r50246
-rw-r--r--base/internal_version.h4
-rw-r--r--base/internal_version.h.in4
-rwxr-xr-xconfigure4
3 files changed, 11 insertions, 1 deletions
diff --git a/base/internal_version.h b/base/internal_version.h
index bdd0474c2b..533348ace4 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -2,4 +2,8 @@
#define SCUMMVM_SVN_REVISION
#endif
+#ifdef RELEASE_BUILD
+#undef SCUMMVM_SVN_REVISION
+#endif
+
#define SCUMMVM_VERSION "1.2.0svn" SCUMMVM_SVN_REVISION
diff --git a/base/internal_version.h.in b/base/internal_version.h.in
index 1b7e5ed147..0199b67d5c 100644
--- a/base/internal_version.h.in
+++ b/base/internal_version.h.in
@@ -2,4 +2,8 @@
#define SCUMMVM_SVN_REVISION
#endif
+#ifdef RELEASE_BUILD
+#undef SCUMMVM_SVN_REVISION
+#endif
+
#define SCUMMVM_VERSION "@VERSION@" SCUMMVM_SVN_REVISION
diff --git a/configure b/configure
index eeec7df204..d8d7ef8591 100755
--- a/configure
+++ b/configure
@@ -1042,7 +1042,9 @@ fi
if test "$_release_build" = yes; then
# Release mode enabled: enable optimizations. This also
# makes it possible to use -Wuninitialized, so let's do that.
- CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized"
+ # We will also add a define, which indicates we are doing
+ # an build for a release version.
+ CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized -DRELEASE_BUILD"
fi