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

More fixes

This commit is contained in:
dcvz 2024-06-03 11:12:39 +02:00
parent 1f9be47c31
commit fdfab70bd0
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/linux/appimage.sh vendored
View File

@ -1,10 +1,10 @@
ARCH=$(uname -m) ARCH=$(uname -m)
LINUX_DEPLOY_ARCH=$(uname -m) LINUX_DEPLOY_ARCH=$(uname -m)
if [ "$ARCH" == "x86_64" ]; then if [ "$ARCH" = "x86_64" ]; then
ARCH="x86_64" ARCH="x86_64"
LINUX_DEPLOY_ARCH="x86_64" LINUX_DEPLOY_ARCH="x86_64"
elif [ "$ARCH" == "aarch64" ]; then elif [ "$ARCH" = "aarch64" ]; then
ARCH="arm_aarch64" ARCH="arm_aarch64"
LINUX_DEPLOY_ARCH="aarch64" LINUX_DEPLOY_ARCH="aarch64"
else else

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

@ -29,7 +29,7 @@ jobs:
key: ${{ matrix.os }}-z64re-ccache-${{ matrix.type }}-x64 key: ${{ matrix.os }}-z64re-ccache-${{ matrix.type }}-x64
- name: Prepare Build - name: Prepare Build
run: |- run: |-
apt-get install -y unzip llvm-17 llvm-17-tools lld-17 apt-get install -y unzip llvm-17 llvm-17-tools lld-17 curl
git clone ${{ secrets.ZRE_REPO_WITH_PAT }} git clone ${{ secrets.ZRE_REPO_WITH_PAT }}
unzip zre/files.zip > /dev/null 2>&1 unzip zre/files.zip > /dev/null 2>&1
- name: Run N64Recomp & RSPRecomp - name: Run N64Recomp & RSPRecomp
@ -53,14 +53,14 @@ jobs:
rm -rf assets/scss rm -rf assets/scss
tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/ tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/
- name: Archive Zelda64Recomp - name: Archive Zelda64Recomp
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v3
with: with:
name: Zelda64Recompiled-${{ runner.os }}-${{ runner.arch }}-${{ matrix.type }} name: Zelda64Recompiled-${{ runner.os }}-${{ runner.arch }}-${{ matrix.type }}
path: Zelda64Recompiled.tar.gz path: Zelda64Recompiled.tar.gz
- name: Prepare AppImage - name: Prepare AppImage
run: ./.github/linux/appimage.sh run: ./.github/linux/appimage.sh
- name: Zelda64Recomp AppImage - name: Zelda64Recomp AppImage
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v3
with: with:
name: Zelda64Recompiled-AppImage-${{ runner.arch }}-${{ matrix.type }} name: Zelda64Recompiled-AppImage-${{ runner.arch }}-${{ matrix.type }}
path: Zelda64Recompiled-*.AppImage path: Zelda64Recompiled-*.AppImage

17
CMakeLists.txt
View File

@ -75,10 +75,25 @@ target_sources(PatchesLib PRIVATE
set_source_files_properties(${CMAKE_SOURCE_DIR}/RecompiledPatches/patches.c PROPERTIES COMPILE_FLAGS -fno-strict-aliasing) set_source_files_properties(${CMAKE_SOURCE_DIR}/RecompiledPatches/patches.c PROPERTIES COMPILE_FLAGS -fno-strict-aliasing)
# Build patches elf # Build patches elf
set(PATCHES_COMMAND "")
if(DEFINED PATCHES_C_COMPILER)
set(PATCHES_COMMAND "${PATCHES_COMMAND} CC=${PATCHES_C_COMPILER}")
endif()
if(DEFINED PATCHES_LD)
set(PATCHES_COMMAND "${PATCHES_COMMAND} LD=${PATCHES_LD}")
endif()
if(DEFINED PATCHES_OBJCOPY)
set(PATCHES_COMMAND "${PATCHES_COMMAND} OBJCOPY=${PATCHES_OBJCOPY}")
endif()
add_custom_target(PatchesBin add_custom_target(PatchesBin
COMMAND CC=${PATCHES_C_COMPILER} LD=${PATCHES_LD} OBJCOPY=${PATCHES_OBJCOPY} make COMMAND ${PATCHES_COMMAND} make
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/patches WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/patches
BYPRODUCTS ${CMAKE_SOURCE_DIR}/patches/patches.bin BYPRODUCTS ${CMAKE_SOURCE_DIR}/patches/patches.bin
VERBATIM
) )
# Generate patches_bin.c from patches.bin # Generate patches_bin.c from patches.bin