Skip to content

Commit 1aff436

Browse files
authored
Windows: update dispatch + include version in executable properties (fixes# 3166)
* Update dispatch for windows * Windows: display proper version
1 parent 1c6fa4c commit 1aff436

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

premake5.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ filter "platforms:Windows"
108108

109109
-- clang preset in premake5 does not support icon compiling, define it here
110110
filter 'files:**.rc'
111-
buildcommands {'windres -O coff -o "%{cfg.objdir}/%{file.basename}.o" "%{file.relpath}"'}
111+
buildcommands {'windres --define VERSION=\"' .. get_version() .. '\" -O coff -o "%{cfg.objdir}/%{file.basename}.o" "%{file.relpath}"'}
112112
buildoutputs {'%{cfg.objdir}/%{file.basename}.o'}
113113

114114
-- YASM compiling for ffap

shared/windows/Resources.rc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#include "winver.h"
2+
#define str(x) stri(x)
3+
#define stri(x) #x
24

35
VS_VERSION_INFO VERSIONINFO
46
FILEVERSION 1,0,0,0
@@ -14,7 +16,7 @@ VS_VERSION_INFO VERSIONINFO
1416
VALUE "LegalCopyright", "\0"
1517
VALUE "OriginalFilename", "deadbeef.exe\0"
1618
VALUE "ProductName", "DeaDBeeF\0"
17-
VALUE "ProductVersion", "1.0.0.0\0"
19+
VALUE "ProductVersion", str(VERSION)
1820
}
1921
}
2022
BLOCK "VarFileInfo"

travis/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ case "$TRAVIS_OS_NAME" in
3838
cd ../../..
3939
;;
4040
windows)
41-
DISPATCH_URL="https://github.com/DeaDBeeF-for-Windows/swift-corelibs-libdispatch/releases/download/release%2F5.10/ddb-xdispatch-win-latest.zip"
41+
DISPATCH_URL="https://github.com/DeaDBeeF-for-Windows/swift-corelibs-libdispatch/releases/download/release%2F6.0.3/ddb-xdispatch-win-latest.zip"
4242
PREMAKE_URL="https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-windows.zip"
4343
DEPS_URL="https://github.com/kuba160/deadbeef-windows-deps.git"
4444
echo "Downloading xdispatch_ddb..."

0 commit comments

Comments
 (0)