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 mesonbuild/meson#8954 lands.
Vaxin3d · Jul 3, 2021 · 120585c · 120585c
1 parent c8a9308
commit 120585c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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'