mirror of
https://github.com/Mr-Wiseguy/Zelda64Recomp.git
synced 2024-11-27 15:14:20 +01:00
Fix strict mode validation failure in latest N64Recomp version and update N64Recomp commit in github workflow
This commit is contained in:
parent
af1404b83d
commit
d99a84f04f
8
.github/workflows/validate.yml
vendored
8
.github/workflows/validate.yml
vendored
@ -9,7 +9,7 @@ on:
|
||||
N64RECOMP_COMMIT:
|
||||
type: string
|
||||
required: false
|
||||
default: 'f8d439aeee6048b7365d1cb3bcd2578ec27a0288'
|
||||
default: '5b17bf8bb556d2544c6161487232a455eae8f188'
|
||||
DXC_CHECKSUM:
|
||||
type: string
|
||||
required: false
|
||||
@ -64,7 +64,7 @@ jobs:
|
||||
|
||||
# Build N64Recomp & RSPRecomp
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
|
||||
cmake --build cmake-build --config Release --target N64Recomp -j $(nproc)
|
||||
cmake --build cmake-build --config Release --target N64RecompCLI -j $(nproc)
|
||||
cmake --build cmake-build --config Release --target RSPRecomp -j $(nproc)
|
||||
|
||||
# Copy N64Recomp & RSPRecomp to root directory
|
||||
@ -160,7 +160,7 @@ jobs:
|
||||
|
||||
# Build N64Recomp & RSPRecomp
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
|
||||
cmake --build cmake-build --config Release --target N64Recomp -j $(nproc)
|
||||
cmake --build cmake-build --config Release --target N64RecompCLI -j $(nproc)
|
||||
cmake --build cmake-build --config Release --target RSPRecomp -j $(nproc)
|
||||
|
||||
# Copy N64Recomp & RSPRecomp to root directory
|
||||
@ -234,7 +234,7 @@ jobs:
|
||||
$cpuCores = (Get-CimInstance -ClassName Win32_Processor).NumberOfLogicalProcessors
|
||||
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
|
||||
cmake --build cmake-build --config Release --target N64Recomp -j $cpuCores
|
||||
cmake --build cmake-build --config Release --target N64RecompCLI -j $cpuCores
|
||||
cmake --build cmake-build --config Release --target RSPRecomp -j $cpuCores
|
||||
|
||||
# Copy N64Recomp & RSPRecomp to root directory
|
||||
|
@ -1266,7 +1266,7 @@ extern Gfx ovl_En_Tanron1_DL_001888[];
|
||||
extern Gfx ovl_En_Tanron1_DL_001900[];
|
||||
|
||||
// @recomp Patched to interpolate the moths that circle torches.
|
||||
void func_80BB5AAC(EnTanron1* this, PlayState* play) {
|
||||
RECOMP_PATCH void func_80BB5AAC(EnTanron1* this, PlayState* play) {
|
||||
EnTanron1Struct* ptrBase = &this->unk_160[0];
|
||||
s16 i;
|
||||
u8 flag = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user