thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eugene Sandulenko 2016-09-10 22:19:32 +02:00
parent 2fd2374992
commit 4af0bc4924
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile.common
View file

@ -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
######################################################################

2
base/version.cpp
View file

@ -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 */