diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index b9f7c96..e2f5fd7 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -9,7 +9,7 @@ on: N64RECOMP_COMMIT: type: string required: false - default: 'd33d38161798167929b114c2b0fd445f9670e10a' + default: 'fc696046da3e703450559154d9370ca74c197f8b' DXC_CHECKSUM: type: string required: false diff --git a/CMakeLists.txt b/CMakeLists.txt index d737837..c660365 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,7 @@ target_include_directories(RecompiledFuncs PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/ultramodern/include ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/librecomp/include + ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/N64Recomp/include ) file(GLOB FUNC_C_SOURCES ${CMAKE_SOURCE_DIR}/RecompiledFuncs/*.c) @@ -79,6 +80,7 @@ target_include_directories(PatchesLib PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/ultramodern/include ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/librecomp/include + ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/N64Recomp/include ) target_sources(PatchesLib PRIVATE @@ -97,12 +99,8 @@ if(NOT DEFINED PATCHES_LD) set(PATCHES_LD ld.lld) endif() -if(NOT DEFINED PATCHES_OBJCOPY) - set(PATCHES_OBJCOPY llvm-objcopy) -endif() - add_custom_target(PatchesBin - COMMAND ${CMAKE_COMMAND} -E env CC=${PATCHES_C_COMPILER} LD=${PATCHES_LD} OBJCOPY=${PATCHES_OBJCOPY} make + COMMAND ${CMAKE_COMMAND} -E env CC=${PATCHES_C_COMPILER} LD=${PATCHES_LD} make WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/patches BYPRODUCTS ${CMAKE_SOURCE_DIR}/patches/patches.elf ) @@ -167,6 +165,7 @@ set (SOURCES target_include_directories(Zelda64Recompiled PRIVATE ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/N64Recomp/include ${CMAKE_SOURCE_DIR}/lib/concurrentqueue ${CMAKE_SOURCE_DIR}/lib/GamepadMotionHelpers ${CMAKE_SOURCE_DIR}/lib/RmlUi/Include diff --git a/lib/N64ModernRuntime b/lib/N64ModernRuntime index 1361c48..d17a3f3 160000 --- a/lib/N64ModernRuntime +++ b/lib/N64ModernRuntime @@ -1 +1 @@ -Subproject commit 1361c48f59877f1bb8189a27bf38e1983fcbb738 +Subproject commit d17a3f34cb223ef51865ae99d1eb8339ab796043 diff --git a/patches/patch_helpers.h b/patches/patch_helpers.h index 371e8b4..f6b88d3 100644 --- a/patches/patch_helpers.h +++ b/patches/patch_helpers.h @@ -4,7 +4,7 @@ #ifdef MIPS #include "ultra64.h" #else -#include "librecomp/recomp.h" +#include "recomp.h" #endif #ifdef __cplusplus diff --git a/src/game/input.cpp b/src/game/input.cpp index 4aff5e6..fc707ee 100644 --- a/src/game/input.cpp +++ b/src/game/input.cpp @@ -2,7 +2,7 @@ #include #include "ultramodern/ultramodern.hpp" -#include "librecomp/recomp.h" +#include "recomp.h" #include "recomp_input.h" #include "zelda_config.h" #include "recomp_ui.h" diff --git a/src/game/recomp_api.cpp b/src/game/recomp_api.cpp index 28b4779..00c8f34 100644 --- a/src/game/recomp_api.cpp +++ b/src/game/recomp_api.cpp @@ -1,6 +1,6 @@ #include -#include "librecomp/recomp.h" +#include "recomp.h" #include "librecomp/overlays.hpp" #include "zelda_config.h" #include "recomp_input.h"