armsx/ARMSX1
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX1.git synced 2026-08-24 16:53:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Switch fsui submodule to fuse-lib on GitHub

Browse Source
This commit is contained in:
moonpower
2026-08-04 23:07:17 +02:00
parent 90fe34710d
commit 63ff9ab65b
15 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/build.yml
+7 -7
View File
@@ -48,7 +48,7 @@ jobs:
set -euo pipefail set -euo pipefail
token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}"
if [ -z "$token" ]; then if [ -z "$token" ]; then
echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2
exit 1 exit 1
fi fi
@@ -104,7 +104,7 @@ jobs:
set -euo pipefail set -euo pipefail
token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}"
if [ -z "$token" ]; then if [ -z "$token" ]; then
echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2
exit 1 exit 1
fi fi
@@ -183,7 +183,7 @@ jobs:
set -euo pipefail set -euo pipefail
token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}"
if [ -z "$token" ]; then if [ -z "$token" ]; then
echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2
exit 1 exit 1
fi fi
@@ -282,7 +282,7 @@ jobs:
set -euo pipefail set -euo pipefail
token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}"
if [ -z "$token" ]; then if [ -z "$token" ]; then
echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2
exit 1 exit 1
fi fi
@@ -349,7 +349,7 @@ jobs:
set -euo pipefail set -euo pipefail
token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}"
if [ -z "$token" ]; then if [ -z "$token" ]; then
echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2
exit 1 exit 1
fi fi
@@ -408,7 +408,7 @@ jobs:
set -euo pipefail set -euo pipefail
token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}"
if [ -z "$token" ]; then if [ -z "$token" ]; then
echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2
exit 1 exit 1
fi fi
@@ -501,7 +501,7 @@ jobs:
set -euo pipefail set -euo pipefail
token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}"
if [ -z "$token" ]; then if [ -z "$token" ]; then
echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2
exit 1 exit 1
fi fi
.gitmodules
+3 -3
View File
@@ -1,9 +1,9 @@
[submodule "third_party/SDL"] [submodule "third_party/SDL"]
path = third_party/SDL path = third_party/SDL
url = https://github.com/libsdl-org/SDL.git url = https://github.com/libsdl-org/SDL.git
[submodule "third_party/fsui-lib"]
path = third_party/fsui-lib
url = https://git.nanodata.cloud/moonpower/fsui-lib.git
[submodule "third_party/libchdr"] [submodule "third_party/libchdr"]
path = third_party/libchdr path = third_party/libchdr
url = https://github.com/rtissera/libchdr.git url = https://github.com/rtissera/libchdr.git
[submodule "third_party/fuse-lib"]
path = third_party/fuse-lib
url = https://github.com/momo-AUX1/fuse-lib.git
Makefile
+1 -1
View File
@@ -44,7 +44,7 @@ IOS_SDL_FRAMEWORK ?= $(CURDIR)/ios/Frameworks/SDL2.xcframework/ios-arm64/SDL2.fr
IOS_SDL_FRAMEWORK_PARENT := $(dir $(IOS_SDL_FRAMEWORK)) IOS_SDL_FRAMEWORK_PARENT := $(dir $(IOS_SDL_FRAMEWORK))
SDKROOT ?= SDKROOT ?=
CONTROLLER_GENERIC ?= 0 CONTROLLER_GENERIC ?= 0
FSUI_DIR := third_party/fsui-lib FSUI_DIR := third_party/fuse-lib
FSUI_BUILD_DIR ?= build/fsui/native FSUI_BUILD_DIR ?= build/fsui/native
WASM_HTML_POSTPROCESS := web/postprocess_web_html.cmake WASM_HTML_POSTPROCESS := web/postprocess_web_html.cmake
FSUI_LINK_SYSTEM_GL ?= 1 FSUI_LINK_SYSTEM_GL ?= 1
build-uwp-all.ps1
+1 -1
View File
@@ -54,7 +54,7 @@ if (-not $MsBuildCommand) {
New-Item -ItemType Directory -Force -Path bin, $UwpOutputDir, $UwpIconsDir | Out-Null New-Item -ItemType Directory -Force -Path bin, $UwpOutputDir, $UwpIconsDir | Out-Null
cmake -S third_party/fsui-lib -B $FsuiBuildDir -G "MinGW Makefiles" ` cmake -S third_party/fuse-lib -B $FsuiBuildDir -G "MinGW Makefiles" `
-DFSUI_BUILD_SAMPLES=OFF ` -DFSUI_BUILD_SAMPLES=OFF `
-DFSUI_PLATFORM_BACKEND=SDL2 ` -DFSUI_PLATFORM_BACKEND=SDL2 `
-DFSUI_USE_SYSTEM_SDL2=ON ` -DFSUI_USE_SYSTEM_SDL2=ON `
build-uwp-native.sh
+1 -1
View File
@@ -184,7 +184,7 @@ fi
mkdir -p "$repo_root/bin" "$uwp_output_dir" "$uwp_icons_dir" mkdir -p "$repo_root/bin" "$uwp_output_dir" "$uwp_icons_dir"
cmake -S "$repo_root/third_party/fsui-lib" -B "$fsui_build_dir" -G "MinGW Makefiles" \ cmake -S "$repo_root/third_party/fuse-lib" -B "$fsui_build_dir" -G "MinGW Makefiles" \
-DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_BUILD_SAMPLES=OFF \
-DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_PLATFORM_BACKEND=SDL2 \
-DFSUI_USE_SYSTEM_SDL2=ON \ -DFSUI_USE_SYSTEM_SDL2=ON \
build-win32.ps1
+1 -1
View File
@@ -20,7 +20,7 @@ if (!(Test-Path $SDL2_ROOT)) {
mkdir -Force -Path bin > $null mkdir -Force -Path bin > $null
mkdir -Force -Path "bin\icons" > $null mkdir -Force -Path "bin\icons" > $null
cmake -S third_party/fsui-lib -B $FSUI_BUILD_DIR -G "MinGW Makefiles" ` cmake -S third_party/fuse-lib -B $FSUI_BUILD_DIR -G "MinGW Makefiles" `
-DFSUI_BUILD_SAMPLES=OFF ` -DFSUI_BUILD_SAMPLES=OFF `
-DFSUI_PLATFORM_BACKEND=SDL2 ` -DFSUI_PLATFORM_BACKEND=SDL2 `
-DFSUI_USE_SYSTEM_SDL2=ON ` -DFSUI_USE_SYSTEM_SDL2=ON `
build-win64.ps1
+1 -1
View File
@@ -20,7 +20,7 @@ if (!(Test-Path $SDL2_ROOT)) {
mkdir -Force -Path bin > $null mkdir -Force -Path bin > $null
mkdir -Force -Path "bin\icons" > $null mkdir -Force -Path "bin\icons" > $null
cmake -S third_party/fsui-lib -B $FSUI_BUILD_DIR -G "MinGW Makefiles" ` cmake -S third_party/fuse-lib -B $FSUI_BUILD_DIR -G "MinGW Makefiles" `
-DFSUI_BUILD_SAMPLES=OFF ` -DFSUI_BUILD_SAMPLES=OFF `
-DFSUI_PLATFORM_BACKEND=SDL2 ` -DFSUI_PLATFORM_BACKEND=SDL2 `
-DFSUI_USE_SYSTEM_SDL2=ON ` -DFSUI_USE_SYSTEM_SDL2=ON `
build.sh
+7 -7
View File
@@ -42,13 +42,13 @@ resolve_fsui_python() {
build_fsui_native() { build_fsui_native() {
if [ "$(uname -s)" = "Darwin" ]; then if [ "$(uname -s)" = "Darwin" ]; then
MACOS_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET:-10.15}" MACOS_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET:-10.15}"
cmake -S third_party/fsui-lib -B build/fsui/native \ cmake -S third_party/fuse-lib -B build/fsui/native \
-DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_BUILD_SAMPLES=OFF \
-DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_PLATFORM_BACKEND=SDL2 \
-DFSUI_USE_SYSTEM_SDL2=ON \ -DFSUI_USE_SYSTEM_SDL2=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET}" -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET}"
else else
cmake -S third_party/fsui-lib -B build/fsui/native \ cmake -S third_party/fuse-lib -B build/fsui/native \
-DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_BUILD_SAMPLES=OFF \
-DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_PLATFORM_BACKEND=SDL2 \
-DFSUI_USE_SYSTEM_SDL2=ON -DFSUI_USE_SYSTEM_SDL2=ON
@@ -88,7 +88,7 @@ build_fsui_wasm() {
exit 1 exit 1
fi fi
emcmake cmake -S third_party/fsui-lib -B build/fsui/wasm \ emcmake cmake -S third_party/fuse-lib -B build/fsui/wasm \
-DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_BUILD_SAMPLES=OFF \
-DFSUI_PLATFORM_BACKEND=SDL2 -DFSUI_PLATFORM_BACKEND=SDL2
cmake --build build/fsui/wasm -j"${BUILD_JOBS}" cmake --build build/fsui/wasm -j"${BUILD_JOBS}"
@@ -112,8 +112,8 @@ build_fsui_psvita() {
cmake --build build/fsui/psvita -j"${BUILD_JOBS}" cmake --build build/fsui/psvita -j"${BUILD_JOBS}"
# The Vita Rust wrapper expects the FSUI archives in the CMake root output # The Vita Rust wrapper expects the FSUI archives in the CMake root output
# directory, so stage the real archives out of the nested fsui-lib build. # directory, so stage the real archives out of the nested fuse-lib build.
cp build/fsui/psvita/fsui-lib/libfsui*.a build/fsui/psvita/ cp build/fsui/psvita/fuse-lib/libfsui*.a build/fsui/psvita/
} }
bundle_macos_app() { bundle_macos_app() {
@@ -180,7 +180,7 @@ if [ "$MODE" = "ios" ]; then
FSUI_PYTHON="$(resolve_fsui_python)" FSUI_PYTHON="$(resolve_fsui_python)"
echo "Building iOS dylib with SDK ${IOS_SDK} (${IOS_SDKROOT})" echo "Building iOS dylib with SDK ${IOS_SDK} (${IOS_SDKROOT})"
cmake -S third_party/fsui-lib -B build/fsui/ios \ cmake -S third_party/fuse-lib -B build/fsui/ios \
-DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_BUILD_SAMPLES=OFF \
-DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_PLATFORM_BACKEND=SDL2 \
-DFSUI_USE_SYSTEM_SDL2=ON \ -DFSUI_USE_SYSTEM_SDL2=ON \
@@ -334,7 +334,7 @@ elif [ "$MODE" = "android" ]; then
FSUI_BUILD_ROOT="${REPO_ROOT}/build/fsui/android/${ANDROID_ABI}" FSUI_BUILD_ROOT="${REPO_ROOT}/build/fsui/android/${ANDROID_ABI}"
FSUI_PYTHON="$(resolve_fsui_python)" FSUI_PYTHON="$(resolve_fsui_python)"
cmake -S third_party/fsui-lib -B "${FSUI_BUILD_ROOT}" \ cmake -S third_party/fuse-lib -B "${FSUI_BUILD_ROOT}" \
-DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_BUILD_SAMPLES=OFF \
-DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_PLATFORM_BACKEND=SDL2 \
-DFSUI_USE_SYSTEM_SDL2=ON \ -DFSUI_USE_SYSTEM_SDL2=ON \
cmake/psvita-fsui/CMakeLists.txt
+1 -1
View File
@@ -51,7 +51,7 @@ set(FSUI_PLATFORM_BACKEND SDL2 CACHE STRING "Platform backend to build" FORCE)
set(FSUI_IMGUI_OPENGL_ES3 ON CACHE BOOL "Build the fsui OpenGL backend in OpenGL ES 3 mode" FORCE) set(FSUI_IMGUI_OPENGL_ES3 ON CACHE BOOL "Build the fsui OpenGL backend in OpenGL ES 3 mode" FORCE)
set(FSUI_USE_SYSTEM_SDL2 OFF CACHE BOOL "Prefer a system SDL2 package when an SDL target is not already available" FORCE) set(FSUI_USE_SYSTEM_SDL2 OFF CACHE BOOL "Prefer a system SDL2 package when an SDL target is not already available" FORCE)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../third_party/fsui-lib" "${CMAKE_BINARY_DIR}/fsui-lib") add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../third_party/fuse-lib" "${CMAKE_BINARY_DIR}/fuse-lib")
if(DEFINED VITASDK AND VITASDK) if(DEFINED VITASDK AND VITASDK)
# Vita packaging tools reject PIC-style ARM relocations such as R_ARM_BASE_PREL. # Vita packaging tools reject PIC-style ARM relocations such as R_ARM_BASE_PREL.
scripts/ci/build-linux-musl-target.sh
+1 -1
View File
@@ -186,7 +186,7 @@ esac
rm -rf "$fsui_build_dir" "$artifact_root" rm -rf "$fsui_build_dir" "$artifact_root"
mkdir -p "$artifact_root" mkdir -p "$artifact_root"
cmake -S "$repo_root/third_party/fsui-lib" -B "$fsui_build_dir" \ cmake -S "$repo_root/third_party/fuse-lib" -B "$fsui_build_dir" \
-DCMAKE_TOOLCHAIN_FILE="$toolchain_file" \ -DCMAKE_TOOLCHAIN_FILE="$toolchain_file" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_BUILD_SAMPLES=OFF \
scripts/ci/build-linux-target.sh
+1 -1
View File
@@ -17,7 +17,7 @@ package_root="$artifact_root/armsx-linux-$target"
package_zip="$artifact_root/armsx-linux-$target.zip" package_zip="$artifact_root/armsx-linux-$target.zip"
cmake_args=( cmake_args=(
-S "$repo_root/third_party/fsui-lib" -S "$repo_root/third_party/fuse-lib"
-B "$fsui_build_dir" -B "$fsui_build_dir"
-DFSUI_BUILD_SAMPLES=OFF -DFSUI_BUILD_SAMPLES=OFF
-DFSUI_PLATFORM_BACKEND=SDL2 -DFSUI_PLATFORM_BACKEND=SDL2
scripts/ci/build-windows-cross.sh
+1 -1
View File
@@ -56,7 +56,7 @@ if [ -z "$sdl_dll" ]; then
exit 1 exit 1
fi fi
cmake -S "$repo_root/third_party/fsui-lib" -B "$fsui_build_dir" \ cmake -S "$repo_root/third_party/fuse-lib" -B "$fsui_build_dir" \
-DCMAKE_TOOLCHAIN_FILE="$toolchain_file" \ -DCMAKE_TOOLCHAIN_FILE="$toolchain_file" \
-DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_BUILD_SAMPLES=OFF \
-DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_PLATFORM_BACKEND=SDL2 \
third_party/fsui-lib
Vendored
-1
Submodule third_party/fsui-lib deleted from 9ced12b7b9
third_party/fuse-lib
Vendored Submodule
+1
Submodule third_party/fuse-lib added at a830ff1216
web/postprocess_web_html.cmake
+1 -1
View File
@@ -2,7 +2,7 @@ if(NOT DEFINED INPUT_FILE)
message(FATAL_ERROR "postprocess_web_html.cmake requires INPUT_FILE") message(FATAL_ERROR "postprocess_web_html.cmake requires INPUT_FILE")
endif() endif()
include("${CMAKE_CURRENT_LIST_DIR}/../third_party/fsui-lib/cmake/postprocess_web_html.cmake") include("${CMAKE_CURRENT_LIST_DIR}/../third_party/fuse-lib/cmake/postprocess_web_html.cmake")
file(READ "${INPUT_FILE}" html) file(READ "${INPUT_FILE}" html)
file(READ "${CMAKE_CURRENT_LIST_DIR}/file_access.js" file_access) file(READ "${CMAKE_CURRENT_LIST_DIR}/file_access.js" file_access)