[Scummvm-cvs-logs] SF.net SVN: scummvm:[50246] scummvm/trunk

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri Jun 25 00:33:49 CEST 2010


Revision: 50246
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50246&view=rev
Author:   lordhoto
Date:     2010-06-24 22:33:49 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
Disable addition of "SCUMMVM_SVN_REVISION" to the version string, in case --enable-release was specified on configure run.

Modified Paths:
--------------
    scummvm/trunk/base/internal_version.h
    scummvm/trunk/base/internal_version.h.in
    scummvm/trunk/configure

Modified: scummvm/trunk/base/internal_version.h
===================================================================
--- scummvm/trunk/base/internal_version.h	2010-06-24 22:32:52 UTC (rev 50245)
+++ scummvm/trunk/base/internal_version.h	2010-06-24 22:33:49 UTC (rev 50246)
@@ -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

Modified: scummvm/trunk/base/internal_version.h.in
===================================================================
--- scummvm/trunk/base/internal_version.h.in	2010-06-24 22:32:52 UTC (rev 50245)
+++ scummvm/trunk/base/internal_version.h.in	2010-06-24 22:33:49 UTC (rev 50246)
@@ -2,4 +2,8 @@
 #define SCUMMVM_SVN_REVISION
 #endif
 
+#ifdef RELEASE_BUILD
+#undef SCUMMVM_SVN_REVISION
+#endif
+
 #define SCUMMVM_VERSION "@VERSION@" SCUMMVM_SVN_REVISION

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-06-24 22:32:52 UTC (rev 50245)
+++ scummvm/trunk/configure	2010-06-24 22:33:49 UTC (rev 50246)
@@ -1042,7 +1042,9 @@
 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
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list