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