Skip to content

Commit 120585c

Browse files
cwabbott0doitsujin
authored andcommitted
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.
1 parent c8a9308 commit 120585c

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

Diff for: build-win32.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ c = 'i686-w64-mingw32-gcc'
33
cpp = 'i686-w64-mingw32-g++'
44
ar = 'i686-w64-mingw32-ar'
55
strip = 'i686-w64-mingw32-strip'
6+
windres = 'i686-w64-mingw32-windres'
67

78
[properties]
89
needs_exe_wrapper = true

Diff for: build-win64.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ c = 'x86_64-w64-mingw32-gcc'
33
cpp = 'x86_64-w64-mingw32-g++'
44
ar = 'x86_64-w64-mingw32-ar'
55
strip = 'x86_64-w64-mingw32-strip'
6+
windres = 'x86_64-w64-mingw32-windres'
67

78
[properties]
89
needs_exe_wrapper = true

Diff for: meson.build

+1-7
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,7 @@ else
5757
add_global_link_arguments('-static', '-static-libgcc', language: 'c')
5858
add_global_link_arguments('-static', '-static-libgcc', '-static-libstdc++', language: 'cpp')
5959

60-
if cpu_family == 'x86_64'
61-
wrc = find_program('x86_64-w64-mingw32-windres')
62-
elif cpu_family == 'x86'
63-
wrc = find_program('i686-w64-mingw32-windres')
64-
else
65-
error('Unsupported target architecture')
66-
endif
60+
wrc = find_program('windres')
6761
endif
6862

6963
if cpu_family == 'x86_64'

0 commit comments

Comments
 (0)