diff options
author | Loïc Guilloux <glx22@users.noreply.github.com> | 2021-04-20 21:38:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-20 21:38:46 +0200 |
commit | d4f0b6f434911840e2762f89ca0de460f38133f9 (patch) | |
tree | 2cedadbe1e0a9ad7d8f9b1d0004dac4feb1f16a0 /src | |
parent | fe3cd185d7a00d116e0ff06d24b3ac369b297a0e (diff) | |
download | openttd-d4f0b6f434911840e2762f89ca0de460f38133f9.tar.xz |
Fix: [CMake] Auto-fill version details in rev.cpp and ottres.rc (#9066)
Diffstat (limited to 'src')
-rw-r--r-- | src/os/windows/ottdres.rc.in | 4 | ||||
-rw-r--r-- | src/rev.cpp.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in index 741fa0e10..31309382c 100644 --- a/src/os/windows/ottdres.rc.in +++ b/src/os/windows/ottdres.rc.in @@ -77,8 +77,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,11,0,${REV_ISODATE} - PRODUCTVERSION 1,11,0,${REV_ISODATE} + FILEVERSION ${REV_MAJOR},${REV_MINOR},${REV_BUILD},${REV_ISODATE} + PRODUCTVERSION ${REV_MAJOR},${REV_MINOR},${REV_BUILD},${REV_ISODATE} FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/rev.cpp.in b/src/rev.cpp.in index 208588a71..3939ca5a0 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -85,4 +85,4 @@ const byte _openttd_revision_tagged = ${REV_ISTAG}; * final release will always have a lower version number than the released * version, thus making comparisons on specific revisions easy. */ -const uint32 _openttd_newgrf_version = 1 << 28 | 12 << 24 | 0 << 20 | ${REV_ISSTABLETAG} << 19 | 28004; +const uint32 _openttd_newgrf_version = ${REV_MAJOR} << 28 | ${REV_MINOR} << 24 | ${REV_BUILD} << 20 | ${REV_ISSTABLETAG} << 19 | 28004; |