mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Connor Abbott 2021-07-02 14:04:42 +02:00 committed by Philip Rebohle
parent c8a9308c37
commit 120585c66d
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build-win32.txt
View File

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

1
build-win64.txt
View File

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

8
meson.build
View File

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