The-Homebrew-Cloud/Zelda64Recomp
2
0
Fork 0
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git synced 2025-05-02 16:01:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update runtime to integrate live recompiler (#524)

Browse Source
This commit is contained in:
Wiseguy 2025-01-02 21:37:54 -05:00 committed by GitHub
parent 5e5515935e
commit 8dcc616f17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ on:
N64RECOMP_COMMIT: N64RECOMP_COMMIT:
type: string type: string
required: false required: false
default: 'd33d38161798167929b114c2b0fd445f9670e10a' default: 'fc696046da3e703450559154d9370ca74c197f8b'
DXC_CHECKSUM: DXC_CHECKSUM:
type: string type: string
required: false required: false

9
CMakeLists.txt
View File

@ -58,6 +58,7 @@ target_include_directories(RecompiledFuncs PRIVATE
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/ultramodern/include ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/ultramodern/include
${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/librecomp/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) 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}/include
${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/ultramodern/include ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/ultramodern/include
${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/librecomp/include ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/librecomp/include
${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/N64Recomp/include
) )
target_sources(PatchesLib PRIVATE target_sources(PatchesLib PRIVATE
@ -97,12 +99,8 @@ if(NOT DEFINED PATCHES_LD)
set(PATCHES_LD ld.lld) set(PATCHES_LD ld.lld)
endif() endif()
if(NOT DEFINED PATCHES_OBJCOPY)
set(PATCHES_OBJCOPY llvm-objcopy)
endif()
add_custom_target(PatchesBin 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 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/patches
BYPRODUCTS ${CMAKE_SOURCE_DIR}/patches/patches.elf BYPRODUCTS ${CMAKE_SOURCE_DIR}/patches/patches.elf
) )
@ -167,6 +165,7 @@ set (SOURCES
target_include_directories(Zelda64Recompiled PRIVATE target_include_directories(Zelda64Recompiled PRIVATE
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/N64Recomp/include
${CMAKE_SOURCE_DIR}/lib/concurrentqueue ${CMAKE_SOURCE_DIR}/lib/concurrentqueue
${CMAKE_SOURCE_DIR}/lib/GamepadMotionHelpers ${CMAKE_SOURCE_DIR}/lib/GamepadMotionHelpers
${CMAKE_SOURCE_DIR}/lib/RmlUi/Include ${CMAKE_SOURCE_DIR}/lib/RmlUi/Include

2
lib/N64ModernRuntime

@ -1 +1 @@
Subproject commit 1361c48f59877f1bb8189a27bf38e1983fcbb738 Subproject commit d17a3f34cb223ef51865ae99d1eb8339ab796043

2
patches/patch_helpers.h
View File

@ -4,7 +4,7 @@
#ifdef MIPS #ifdef MIPS
#include "ultra64.h" #include "ultra64.h"
#else #else
#include "librecomp/recomp.h" #include "recomp.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

2
src/game/input.cpp
View File

@ -2,7 +2,7 @@
#include <mutex> #include <mutex>
#include "ultramodern/ultramodern.hpp" #include "ultramodern/ultramodern.hpp"
#include "librecomp/recomp.h" #include "recomp.h"
#include "recomp_input.h" #include "recomp_input.h"
#include "zelda_config.h" #include "zelda_config.h"
#include "recomp_ui.h" #include "recomp_ui.h"

2
src/game/recomp_api.cpp
View File

@ -1,6 +1,6 @@
#include <cmath> #include <cmath>
#include "librecomp/recomp.h" #include "recomp.h"
#include "librecomp/overlays.hpp" #include "librecomp/overlays.hpp"
#include "zelda_config.h" #include "zelda_config.h"
#include "recomp_input.h" #include "recomp_input.h"