From 7bdc01345223b9a78dc173f160329766f6066ba5 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 30 Dec 2020 12:25:13 -0800 Subject: [PATCH 1/4] fix warnings as errors --- .github/workflows/docker.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.sh b/.github/workflows/docker.sh index c2df5040f..5bb3f364d 100644 --- a/.github/workflows/docker.sh +++ b/.github/workflows/docker.sh @@ -9,9 +9,14 @@ title="yuzu Early Access $ver" yuzupatch=( $(ls -d patches/* ) ) for i in "${yuzupatch[@]}"; do patch -p1 < "$i"; done +find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror$/-W/g' {} + +find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*)$/ )/g' {} + +find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*$/ /g' {} + +find . -name "CMakeLists.txt" -exec sed -i 's/-Werror/-W/g' {} + + mkdir build && cd build -cmake .. -G Ninja -DCMAKE_CXX_FLAGS="-W" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DTITLE_BAR_FORMAT_IDLE="$title" -DTITLE_BAR_FORMAT_RUNNING="$title | {3}" -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DGIT_BRANCH="HEAD" -DGIT_DESC="$msvc" -DUSE_DISCORD_PRESENCE=ON +cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DTITLE_BAR_FORMAT_IDLE="$title" -DTITLE_BAR_FORMAT_RUNNING="$title | {3}" -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DGIT_BRANCH="HEAD" -DGIT_DESC="$msvc" -DUSE_DISCORD_PRESENCE=ON ninja From a0af84c82ef1b6c47a4f2dc82765da4e21d54637 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 30 Dec 2020 12:26:01 -0800 Subject: [PATCH 2/4] Delete disable-shadow-error.patch --- patches/disable-shadow-error.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 patches/disable-shadow-error.patch diff --git a/patches/disable-shadow-error.patch b/patches/disable-shadow-error.patch deleted file mode 100644 index 1be6da365..000000000 --- a/patches/disable-shadow-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt -index a021d61f5..15c5dedfb 100644 ---- a/src/video_core/CMakeLists.txt -+++ b/src/video_core/CMakeLists.txt -@@ -310,7 +310,6 @@ else() - -Wno-error=sign-conversion - -Werror=pessimizing-move - -Werror=redundant-move -- -Werror=shadow - -Werror=switch - -Werror=type-limits - -Werror=unused-variable From cef5f8310fe17f18434214f74c58d237451445ba Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 30 Dec 2020 12:26:11 -0800 Subject: [PATCH 3/4] Delete fixvideocorewarns.patch --- patches/fixvideocorewarns.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 patches/fixvideocorewarns.patch diff --git a/patches/fixvideocorewarns.patch b/patches/fixvideocorewarns.patch deleted file mode 100644 index 42fc131f9..000000000 --- a/patches/fixvideocorewarns.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/video_core/CMakeLists.txt -+++ b/src/video_core/CMakeLists.txt -@@ -299,7 +299,6 @@ - /we4457 # Declaration of 'identifier' hides function parameter - /we4458 # Declaration of 'identifier' hides class member - /we4459 # Declaration of 'identifier' hides global declaration -- /we4715 # 'function' : not all control paths return a value - ) - else() - target_compile_options(video_core PRIVATE -@@ -307,10 +305,8 @@ - -Werror=shadow - -Werror=switch - -Werror=type-limits -- -Werror=unused-variable - - $<$:-Werror=class-memaccess> - $<$:-Werror=unused-but-set-parameter> -- $<$:-Werror=unused-but-set-variable> - ) - endif() From 67ab64ac3ef1a99fe6ff89256ec85d5f9c4853a7 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 30 Dec 2020 12:26:19 -0800 Subject: [PATCH 4/4] Delete warning-to-warning.patch --- patches/warning-to-warning.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 patches/warning-to-warning.patch diff --git a/patches/warning-to-warning.patch b/patches/warning-to-warning.patch deleted file mode 100644 index e41a99253..000000000 --- a/patches/warning-to-warning.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0ce9148a24d8060e226f9815b611ab7852c0730e Mon Sep 17 00:00:00 2001 -From: edisionnano -Date: Thu, 5 Nov 2020 11:22:27 +0200 -Subject: [PATCH] Update CMakeLists.txt - ---- - src/common/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt -index 207c7a0a614..e68cfb6ad8e 100644 ---- a/src/common/CMakeLists.txt -+++ b/src/common/CMakeLists.txt -@@ -202,7 +202,7 @@ if (MSVC) - ) - else() - target_compile_options(common PRIVATE -- -Werror -+ -W - ) - endif()