Compare commits

...
4 Commits
Author SHA1 Message Date
niklascfw ff4fd37cdc Fix exosphere build after checkout path rename.
Build Horizon OC Zeus / build (push) Failing after 3s
Clean stale absolute dependency paths when the tree moved, and fail the script instead of copying an old binary.
2026-07-15 23:02:43 +02:00
niklascfw 618fae2532 Merge upstream main into Horizon-OC-pro fork.
Build Horizon OC Zeus / build (push) Failing after 6s
Keep Atmosphere-Pro boot-storage submodule; take remaining upstream updates.
2026-07-15 22:59:30 +02:00
niklascfw 5e9ede09a1 Switch Atmosphere clone to Atmosphere-Pro and add exosphere-only build script.
Build Horizon OC Zeus / build (push) Failing after 48s
Use the boot-storage branch required for Horizon OC exosphere patches, and provide build-exosphere.sh for compiling just exosphere.bin without a full project build.
2026-07-14 23:06:55 +02:00
niklascfw 40968377c5 Fix Atmosphere-libs submodule to point at Atmosphere-Pro boot-storage.
The previous Atmosphere-NX commit is not available in the new remote, which broke submodule update.
2026-07-14 23:06:55 +02:00
5 changed files with 77 additions and 15 deletions

No files matched your search

+2 -2
View File
@@ -1,7 +1,7 @@
[submodule "Source/Horizon-OC-Monitor/lib/Atmosphere-libs"] [submodule "Source/Horizon-OC-Monitor/lib/Atmosphere-libs"]
path = Source/Horizon-OC-Monitor/lib/Atmosphere-libs path = Source/Horizon-OC-Monitor/lib/Atmosphere-libs
url = https://github.com/Atmosphere-NX/Atmosphere-libs url = https://github.com/NaGaa95/Atmosphere-Pro.git
branch = master branch = boot-storage
[submodule "Source/Horizon-OC-Monitor/lib/libultrahand"] [submodule "Source/Horizon-OC-Monitor/lib/libultrahand"]
path = Source/Horizon-OC-Monitor/lib/libultrahand path = Source/Horizon-OC-Monitor/lib/libultrahand
url = https://github.com/ppkantorski/libultrahand url = https://github.com/ppkantorski/libultrahand
+2 -1
View File
@@ -1,6 +1,7 @@
[submodule "lib/Atmosphere-libs"] [submodule "lib/Atmosphere-libs"]
path = lib/Atmosphere-libs path = lib/Atmosphere-libs
url = https://github.com/Atmosphere-NX/Atmosphere-libs url = https://github.com/NaGaa95/Atmosphere-Pro.git
branch = boot-storage
[submodule "lib/libultrahand"] [submodule "lib/libultrahand"]
path = lib/libultrahand path = lib/libultrahand
url = https://github.com/ppkantorski/libultrahand url = https://github.com/ppkantorski/libultrahand
+68
View File
@@ -0,0 +1,68 @@
#!/bin/sh
ROOT_DIR="$(cd "$(dirname "$0")" && pwd)"
DIST_DIR="$ROOT_DIR/dist"
ATMOSPHERE_DIR="$ROOT_DIR/build/atmosphere"
ATMOSPHERE_URL="https://github.com/NaGaa95/Atmosphere-Pro.git"
ATMOSPHERE_BRANCH="boot-storage"
EXO_SRC="$ROOT_DIR/Source/Atmosphere-Patches"
EXO_DEST="$ATMOSPHERE_DIR/exosphere/program/source/smc"
LIBEXO_DEST="$ATMOSPHERE_DIR/libraries/libexosphere/include/exosphere/secmon"
EXO_OUT="$ATMOSPHERE_DIR/exosphere/out/nintendo_nx_arm64_armv8a/release/exosphere.bin"
if command -v nproc >/dev/null 2>&1; then
CORES="$(nproc --all)"
else
CORES="$(sysctl -n hw.ncpu)"
fi
echo "CORES: $CORES"
mkdir -p "$ROOT_DIR/build"
if [ ! -d "$ATMOSPHERE_DIR" ]; then
echo
echo "*** Cloning Atmosphere-Pro ***"
git clone --depth=1 --single-branch -b "$ATMOSPHERE_BRANCH" "$ATMOSPHERE_URL" "$ATMOSPHERE_DIR"
fi
echo
echo "*** Patching exosphere ***"
cp -v "$EXO_SRC/secmon_emc_access_table_data.inc" "$EXO_DEST/"
cp -v "$EXO_SRC/secmon_define_emc_access_table.inc" "$EXO_DEST/"
cp -v "$EXO_SRC/secmon_rtc_pmc_access_table_data.inc" "$EXO_DEST/"
cp -v "$EXO_SRC/secmon_define_rtc_pmc_access_table.inc" "$EXO_DEST/"
cp -v "$EXO_SRC/secmon_smc_register_access.cpp" "$EXO_DEST/"
cp -v "$EXO_SRC/secmon_smc_handler.cpp" "$EXO_DEST/"
cp -v "$EXO_SRC/secmon_memory_layout.hpp" "$LIBEXO_DEST/"
echo
echo "*** Compiling exosphere ***"
cd "$ATMOSPHERE_DIR/exosphere" || exit 1
# .d files store absolute source paths. If this checkout moved (e.g. renamed
# Horizon-OC -> Horizon-OC-pro), those deps point at a dead tree and make fails.
if grep -Rql --include='*.d' '/Desktop/Horizon-OC/' "$ATMOSPHERE_DIR" 2>/dev/null; then
echo "*** Cleaning stale build deps (old Horizon-OC absolute paths) ***"
make clean || true
fi
make -j"$CORES" || {
echo "*** Build failed ***" >&2
exit 1
}
cd "$ROOT_DIR" || exit 1
if [ ! -f "$EXO_OUT" ]; then
echo "*** Missing output: $EXO_OUT ***" >&2
exit 1
fi
mkdir -p "$DIST_DIR/atmosphere"
cp -v "$EXO_OUT" "$DIST_DIR/atmosphere/exosphere.bin"
echo
echo "*** Done: $EXO_OUT ***"
echo "*** Copied to: $DIST_DIR/atmosphere/exosphere.bin ***"
Regular → Executable
+4 -11
View File
@@ -45,20 +45,13 @@ SRC="Source/Atmosphere/stratosphere/loader/"
mkdir -p "build" mkdir -p "build"
ATMOSPHERE_DIR="build/atmosphere" ATMOSPHERE_DIR="build/atmosphere"
ATMOSPHERE_URL="https://github.com/Atmosphere-NX/Atmosphere.git" ATMOSPHERE_URL="https://github.com/NaGaa95/Atmosphere-Pro.git"
ATMOSPHERE_BRANCH="boot-storage"
if [ ! -d "$ATMOSPHERE_DIR" ]; then if [ ! -d "$ATMOSPHERE_DIR" ]; then
echo echo
echo "*** Cloning atmosphere ***" echo "*** Cloning Atmosphere-Pro ***"
git clone "$ATMOSPHERE_URL" "$ATMOSPHERE_DIR" git clone --depth=1 --single-branch -b "$ATMOSPHERE_BRANCH" "$ATMOSPHERE_URL" "$ATMOSPHERE_DIR"
cd "$ATMOSPHERE_DIR"
git fetch --tags --quiet
LATEST_TAG=$(git tag --sort=-version:refname | head -n1)
git checkout -q -b build "$LATEST_TAG"
cd "$ROOT_DIR"
fi fi
DEST="build/atmosphere/stratosphere/loader/" DEST="build/atmosphere/stratosphere/loader/"