From 120585c66da6e7944c300177bf33bffeb545e22c Mon Sep 17 00:00:00 2001
From: Connor Abbott <cwabbott0@gmail.com>
Date: Fri, 2 Jul 2021 14:04:42 +0200
Subject: [PATCH] Don't hardcode windres location

This isn't the meson way to do things. Doing this also prepares us for
using the builtin meson rc support instead of hand-rolling our own once
https://github.com/mesonbuild/meson/pull/8954 lands.
---
 build-win32.txt | 1 +
 build-win64.txt | 1 +
 meson.build     | 8 +-------
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/build-win32.txt b/build-win32.txt
index a1406832..40e9d47d 100644
--- a/build-win32.txt
+++ b/build-win32.txt
@@ -3,6 +3,7 @@ c = 'i686-w64-mingw32-gcc'
 cpp = 'i686-w64-mingw32-g++'
 ar = 'i686-w64-mingw32-ar'
 strip = 'i686-w64-mingw32-strip'
+windres = 'i686-w64-mingw32-windres'
 
 [properties]
 needs_exe_wrapper = true
diff --git a/build-win64.txt b/build-win64.txt
index 1aee4626..8eb1b29d 100644
--- a/build-win64.txt
+++ b/build-win64.txt
@@ -3,6 +3,7 @@ c = 'x86_64-w64-mingw32-gcc'
 cpp = 'x86_64-w64-mingw32-g++'
 ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
+windres = 'x86_64-w64-mingw32-windres'
 
 [properties]
 needs_exe_wrapper = true
diff --git a/meson.build b/meson.build
index d8dffa60..2bf170cd 100644
--- a/meson.build
+++ b/meson.build
@@ -57,13 +57,7 @@ else
   add_global_link_arguments('-static', '-static-libgcc', language: 'c')
   add_global_link_arguments('-static', '-static-libgcc', '-static-libstdc++', language: 'cpp')
 
-  if cpu_family == 'x86_64'
-    wrc = find_program('x86_64-w64-mingw32-windres')
-  elif cpu_family == 'x86'
-    wrc = find_program('i686-w64-mingw32-windres')
-  else
-    error('Unsupported target architecture')
-  endif
+  wrc = find_program('windres')
 endif
 
 if cpu_family == 'x86_64'