rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-11-29 01:24:11 +01:00
Code Issues Projects Releases Wiki Activity

[meta] Do not use built-in arguments

Browse Source 
Breaks ancient meson versions. Should fix #1893.
This commit is contained in:
Philip Rebohle 2021-01-12 00:53:05 +01:00
parent 0eec95843f
commit 8163eb4185
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-win32.txt
View File

@ -4,10 +4,6 @@ cpp = 'i686-w64-mingw32-g++'
ar = 'i686-w64-mingw32-ar' ar = 'i686-w64-mingw32-ar'
strip = 'i686-w64-mingw32-strip' strip = 'i686-w64-mingw32-strip'
[built-in options]
c_link_args = ['-static', '-static-libgcc']
cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
[properties] [properties]
needs_exe_wrapper = true needs_exe_wrapper = true

4
build-win64.txt
View File

@ -4,10 +4,6 @@ cpp = 'x86_64-w64-mingw32-g++'
ar = 'x86_64-w64-mingw32-ar' ar = 'x86_64-w64-mingw32-ar'
strip = 'x86_64-w64-mingw32-strip' strip = 'x86_64-w64-mingw32-strip'
[built-in options]
c_link_args = ['-static', '-static-libgcc']
cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
[properties] [properties]
needs_exe_wrapper = true needs_exe_wrapper = true

3
meson.build
View File

@ -39,6 +39,9 @@ dxvk_extradep = [ ]
if dxvk_compiler.get_id() == 'msvc' if dxvk_compiler.get_id() == 'msvc'
wrc = find_program('rc') wrc = find_program('rc')
else 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' if cpu_family == 'x86_64'
wrc = find_program('x86_64-w64-mingw32-windres') wrc = find_program('x86_64-w64-mingw32-windres')
elif cpu_family == 'x86' elif cpu_family == 'x86'