Mirrors
/
Zelda64Recomp
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to support latest N64Recomp - Silence warnings in CMake (#358)

This commit is contained in:
David Chavez 2024-06-05 07:58:24 +02:00 committed by GitHub
parent bec699f0bd
commit 030d793056
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/validate.yml vendored
View File

@ -25,7 +25,7 @@ jobs:
- name: ccache - name: ccache
uses: hendrikmuhs/ccache-action@v1.2 uses: hendrikmuhs/ccache-action@v1.2
with: with:
key: ${{ matrix.os }}-z64re-ccache-${{ matrix.type }} key: ${{ matrix.os }}-z64re-ccache-${{ matrix.type }}-${{ matrix.arch }}
- name: Install Linux Dependencies - name: Install Linux Dependencies
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
@ -56,7 +56,7 @@ jobs:
run: | run: |
git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource
cd N64RecompSource cd N64RecompSource
git checkout 8dfed04919b7bfdd0fd34ff049eed7020dea0d71 git checkout 2a2df89349ff25a3afb3a09617deb3a166efe2f3
git submodule update --init --recursive git submodule update --init --recursive
# enable ccache # enable ccache
@ -130,7 +130,7 @@ jobs:
run: | run: |
git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource
cd N64RecompSource cd N64RecompSource
git checkout 8dfed04919b7bfdd0fd34ff049eed7020dea0d71 git checkout 2a2df89349ff25a3afb3a09617deb3a166efe2f3
git submodule update --init --recursive git submodule update --init --recursive
# enable ccache # enable ccache

3
CMakeLists.txt
View File

@ -41,6 +41,7 @@ add_library(RecompiledFuncs STATIC)
target_compile_options(RecompiledFuncs PRIVATE target_compile_options(RecompiledFuncs PRIVATE
# -Wno-unused-but-set-variable # -Wno-unused-but-set-variable
-fno-strict-aliasing -fno-strict-aliasing
-Wno-unused-variable
-Wno-implicit-function-declaration -Wno-implicit-function-declaration
) )
@ -61,6 +62,8 @@ add_library(PatchesLib STATIC)
target_compile_options(PatchesLib PRIVATE target_compile_options(PatchesLib PRIVATE
# -Wno-unused-but-set-variable # -Wno-unused-but-set-variable
-fno-strict-aliasing -fno-strict-aliasing
-Wno-unused-variable
-Wno-implicit-function-declaration
) )
target_include_directories(PatchesLib PRIVATE target_include_directories(PatchesLib PRIVATE

4
include/disable_warnings.h
View File

@ -1,4 +0,0 @@
#ifdef __clang__
#pragma clang diagnostic ignored "-Wunused-variable"
#pragma clang diagnostic ignored "-Wimplicit-function-declaration"
#endif