tmweaver
/
overlay
forked from tastytea/overlay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app-emulation/dxvk/files: Update compiler-flags patch for 9999.

This commit is contained in:
tastytea 2021-01-13 16:38:08 +01:00
parent 115529e38b
commit ccd17b90aa
Signed by untrusted user: tastytea
GPG Key ID: CFC39497F1B26E07
1 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app-emulation/dxvk/files/dxvk-9999_add-compiler-flags.patch
View File

@ -1,59 +1,45 @@
From 3af87af2759dc63738f50dda2482b809e2ba247f Mon Sep 17 00:00:00 2001
From fa1ead4a488b90593c05f5ce634fd3f9e8dd6b81 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Tue, 5 Jan 2021 00:16:38 +0100
Date: Wed, 13 Jan 2021 16:35:34 +0100
Subject: [PATCH] Add compiler and linker flags.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Revert “built-in options” to “properties” for <meson-0.56 compatibility.
---
build-win32.txt | 9 +++++----
build-win64.txt | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
build-win32.txt | 5 +++++
build-win64.txt | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/build-win32.txt b/build-win32.txt
index 2cb5cf0a..f2252c3e 100644
index a1406832..c3c9521c 100644
--- a/build-win32.txt
+++ b/build-win32.txt
@@ -4,11 +4,12 @@ cpp = 'i686-w64-mingw32-g++'
ar = 'i686-w64-mingw32-ar'
strip = 'i686-w64-mingw32-strip'
-[built-in options]
-c_link_args = ['-static', '-static-libgcc']
-cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
-
@@ -7,6 +7,11 @@ strip = 'i686-w64-mingw32-strip'
[properties]
+c_args = @CFLAGS@
+cpp_args = @CXXFLAGS@
+c_link_args = @LDFLAGS@ + ['-static', '-static-libgcc']
+cpp_link_args = @LDFLAGS@ + ['-static', '-static-libgcc', '-static-libstdc++']
+
needs_exe_wrapper = true
+c_args = @CFLAGS@
+cpp_args = @CXXFLAGS@
+c_link_args = @LDFLAGS@
+cpp_link_args = @LDFLAGS@
+
[host_machine]
system = 'windows'
cpu_family = 'x86'
diff --git a/build-win64.txt b/build-win64.txt
index 1fad5ab7..6e9c7340 100644
index 1aee4626..50960343 100644
--- a/build-win64.txt
+++ b/build-win64.txt
@@ -4,11 +4,12 @@ cpp = 'x86_64-w64-mingw32-g++'
ar = 'x86_64-w64-mingw32-ar'
strip = 'x86_64-w64-mingw32-strip'
-[built-in options]
-c_link_args = ['-static', '-static-libgcc']
-cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
-
@@ -7,6 +7,11 @@ strip = 'x86_64-w64-mingw32-strip'
[properties]
+c_args = @CFLAGS@
+cpp_args = @CXXFLAGS@
+c_link_args = @LDFLAGS@ + ['-static', '-static-libgcc']
+cpp_link_args = @LDFLAGS@ + ['-static', '-static-libgcc', '-static-libstdc++']
+
needs_exe_wrapper = true
+c_args = @CFLAGS@
+cpp_args = @CXXFLAGS@
+c_link_args = @LDFLAGS@
+cpp_link_args = @LDFLAGS@
+
[host_machine]
system = 'windows'
cpu_family = 'x86_64'
--
2.26.2