[Scummvm-git-logs] scummvm master -> 4af0bc492457909a13ffa688814e3b1665a66277

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4af0bc4924 AMIGAOS: Amiga needs date in specific format in version cookie. Now AmiUpdate works


Commit: 4af0bc492457909a13ffa688814e3b1665a66277
    https://github.com/scummvm/scummvm/commit/4af0bc492457909a13ffa688814e3b1665a66277
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-10T22:19:32+02:00

Commit Message:
AMIGAOS: Amiga needs date in specific format in version cookie. Now AmiUpdate works

Changed paths:
    Makefile.common
    base/version.cpp



diff --git a/Makefile.common b/Makefile.common
index 1c6403d..f910da6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -165,6 +165,11 @@ VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
 VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)
 VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)
 
+#ifdef AMIGAOS
+# Amiga needs date in specific format for the version cookie
+AMIGA_DATE = $(shell gdate '+%d.%m.%Y')
+base/version.o: CXXFLAGS:=$(CXXFLAGS) -DAMIGA_DATE=\"$(AMIGA_DATE)\"
+#endif
 
 ######################################################################
 # Get git's working copy information
@@ -182,13 +187,10 @@ else
 GITROOT := git://github.com/scummvm/scummvm.git
 endif
 
-# Amiga needs date in another format
-AMIGA_DATE = $(shell date '+%d.%m.%Y')
-
 # Define the Subversion revision if available, either autodetected or
 # specified by the user, but only for base/version.cpp.
 ifneq ($(origin VER_REV), undefined)
-base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_REVISION=\"$(VER_REV)\" -DAMIGA_DATE=\"$(AMIGA_DATE)\"
+base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_REVISION=\"$(VER_REV)\"
 endif
 
 ######################################################################
diff --git a/base/version.cpp b/base/version.cpp
index d40dd57..4379529 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -57,7 +57,7 @@
  */
 const char *gScummVMVersion = SCUMMVM_VERSION;
 #ifdef __amigaos4__
-static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION " (" __DATE__ ", " __TIME__ ")";
+static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION " (" AMIGA_DATE ")";
 #endif
 #ifdef __PLAYSTATION2__
 const char *gScummVMBuildDate = "Git Master"; /* ScummVM Git Master */