Skip to content

Bump Torch #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KiritoDv wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Bump Torch #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6d3c91
Bump Torch
KiritoDv Jan 27, 2026
53bd1a1
Added version generation on cmake
KiritoDv Jan 27, 2026
a327d6f
Modified CI to use GeneratePortO2R instead
KiritoDv Jan 27, 2026
dfcaa87
Added missing dependencies on o2r
KiritoDv Jan 27, 2026
bfef394
Updated cache
KiritoDv Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- name: Update machine
run: sudo apt update
- name: Install dependencies
run: sudo apt-get install gcc g++ git cmake ninja-build lsb-release
run: sudo apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev libogg-dev libvorbis-dev
- name: ccache
uses: hendrikmuhs/[email protected]
with:
Expand All @@ -30,12 +32,14 @@ jobs:
${{ runner.os }}-o2r-build-${{ github.ref }}
${{ runner.os }}-o2r-build-
path: |
Torch/cmake-build-release
SDL2-2.30.3
tinyxml2-10.0.0
libzip-1.10.1
- name: Generate ghostship.o2r
run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
make -C Torch type=release -j3
Torch/cmake-build-release/torch pack port ghostship.o2r o2r
cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
cmake --build build-cmake -j --target GeneratePortO2R
- uses: actions/upload-artifact@v4
with:
name: ghostship.o2r
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,15 +611,15 @@ add_custom_target(
ExtractAssets
DEPENDS TorchExternal
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND ${TORCH_EXECUTABLE} o2r baserom.us.z64
COMMAND ${TORCH_EXECUTABLE} o2r baserom.us.z64 -u ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/sm64.o2r" "${CMAKE_BINARY_DIR}/sm64.o2r"
)

add_custom_target(
GeneratePortO2R
DEPENDS TorchExternal
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND ${TORCH_EXECUTABLE} pack port ghostship.o2r o2r
COMMAND ${TORCH_EXECUTABLE} pack port ghostship.o2r o2r -u ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/ghostship.o2r" "${CMAKE_BINARY_DIR}/ghostship.o2r"
)

Expand Down
2 changes: 1 addition & 1 deletion Torch
Open in desktop
Submodule Torch updated 19 files
+3 −1 CMakeLists.txt
+15 −0 README.md
+196 −0 lib/TinySHA1.hpp
+0 −633 lib/hj/sha1.h
+66 −27 src/Companion.cpp
+4 −1 src/Companion.h
+5 −4 src/factories/CompressedTextureFactory.cpp
+2 −1 src/factories/DisplayListOverrides.cpp
+3 −2 src/factories/TextureFactory.cpp
+4 −4 src/factories/fzerox/SequenceFactory.cpp
+1 −1 src/factories/fzerox/SoundFontFactory.cpp
+6 −5 src/factories/naudio/v0/AudioManager.cpp
+0 −1 src/factories/naudio/v1/AudioContext.cpp
+2 −1 src/factories/naudio/v1/AudioTableFactory.cpp
+6 −4 src/factories/sf64/MessageFactory.cpp
+1 −1 src/factories/sm64/GeoLayoutFactory.cpp
+5 −2 src/main.cpp
+3 −2 src/utils/Decompressor.cpp
+9 −0 src/utils/TorchUtils.h
Loading