From cfcbc2ac218612b2e9d2322ceb98ec99d7cd9381 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Thu, 9 Dec 2021 22:58:31 +0100 Subject: [PATCH] Add icon to scrcpy.exe The icon will be associated to scrcpy.exe in the Windows explorer. The .ico was created using imagemagick: convert icon.png icon.ico It is included as a binary for simplicity. Refs #2815 --- app/meson.build | 2 ++ app/scrcpy-windows.rc | 1 + cross_win32.txt | 1 + cross_win64.txt | 1 + data/icon.ico | Bin 0 -> 8840 bytes 5 files changed, 5 insertions(+) create mode 100644 app/scrcpy-windows.rc create mode 100644 data/icon.ico diff --git a/app/meson.build b/app/meson.build index 3916b098..4c0e909d 100644 --- a/app/meson.build +++ b/app/meson.build @@ -49,9 +49,11 @@ conf.set('_XOPEN_SOURCE', '700') conf.set('_GNU_SOURCE', true) if host_machine.system() == 'windows' + windows = import('windows') src += [ 'src/sys/win/file.c', 'src/sys/win/process.c', + windows.compile_resources('scrcpy-windows.rc'), ] conf.set('_WIN32_WINNT', '0x0600') conf.set('WINVER', '0x0600') diff --git a/app/scrcpy-windows.rc b/app/scrcpy-windows.rc new file mode 100644 index 00000000..0dadc84c --- /dev/null +++ b/app/scrcpy-windows.rc @@ -0,0 +1 @@ +0 ICON "../data/icon.ico" diff --git a/cross_win32.txt b/cross_win32.txt index 4db17be7..41ec3078 100644 --- a/cross_win32.txt +++ b/cross_win32.txt @@ -7,6 +7,7 @@ cpp = 'i686-w64-mingw32-g++' ar = 'i686-w64-mingw32-ar' strip = 'i686-w64-mingw32-strip' pkgconfig = 'i686-w64-mingw32-pkg-config' +windres = 'i686-w64-mingw32-windres' [host_machine] system = 'windows' diff --git a/cross_win64.txt b/cross_win64.txt index d03f0272..2565330b 100644 --- a/cross_win64.txt +++ b/cross_win64.txt @@ -7,6 +7,7 @@ cpp = 'x86_64-w64-mingw32-g++' ar = 'x86_64-w64-mingw32-ar' strip = 'x86_64-w64-mingw32-strip' pkgconfig = 'x86_64-w64-mingw32-pkg-config' +windres = 'x86_64-w64-mingw32-windres' [host_machine] system = 'windows' diff --git a/data/icon.ico b/data/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..b3238778fdb225a8df62c1334afb89d86f66d4a1 GIT binary patch literal 8840 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 ZrP6;PhFmM2h1g31D9fwKRm+%%{tsGWu_6Ef literal 0 HcmV?d00001