diff options
| author | Eugene Sandulenko | 2016-09-10 22:19:32 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-09-10 22:19:32 +0200 |
| commit | 4af0bc492457909a13ffa688814e3b1665a66277 (patch) | |
| tree | 5f7b5fa293a9ab4eab3afd799355ffbbe10526ba | |
| parent | 2fd23749924d0ee23f0fe9e48b8bc7831df54853 (diff) | |
| download | scummvm-rg350-4af0bc492457909a13ffa688814e3b1665a66277.tar.gz scummvm-rg350-4af0bc492457909a13ffa688814e3b1665a66277.tar.bz2 scummvm-rg350-4af0bc492457909a13ffa688814e3b1665a66277.zip | |
AMIGAOS: Amiga needs date in specific format in version cookie. Now AmiUpdate works
| -rw-r--r-- | Makefile.common | 10 | ||||
| -rw-r--r-- | base/version.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index 1c6403db0d..f910da62d9 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 d40dd573f0..43795294ba 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 */ |