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 build to system GL

Browse Source
This commit is contained in:
moonpower
2026-04-08 00:17:43 +02:00
parent 554722b4de
commit da890f2c45
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/build.yml
+1 -1
View File
@@ -528,7 +528,7 @@ jobs:
exit 1 exit 1
fi fi
apt_cmd apt-get update apt_cmd apt-get update
DEBIAN_FRONTEND=noninteractive apt_cmd apt-get install -y python3 python3-jinja2 zip DEBIAN_FRONTEND=noninteractive apt_cmd apt-get install -y cmake python3 python3-jinja2 zip
- name: Install Emscripten - name: Install Emscripten
shell: bash shell: bash
Makefile
+2 -12
View File
@@ -45,7 +45,7 @@ CONTROLLER_GENERIC ?= 0
FSUI_DIR := third_party/fsui-lib FSUI_DIR := third_party/fsui-lib
FSUI_BUILD_DIR ?= build/fsui/native FSUI_BUILD_DIR ?= build/fsui/native
WASM_HTML_POSTPROCESS := $(FSUI_DIR)/cmake/postprocess_web_html.cmake WASM_HTML_POSTPROCESS := $(FSUI_DIR)/cmake/postprocess_web_html.cmake
FSUI_LINK_OPENGL ?= 1 FSUI_LINK_SYSTEM_GL ?= 1
ifeq ($(PSVITA_TARGET),1) ifeq ($(PSVITA_TARGET),1)
ifeq ($(strip $(VITASDK)),) ifeq ($(strip $(VITASDK)),)
@@ -217,21 +217,11 @@ FSUI_LIBS := \
$(FSUI_BUILD_DIR)/libfsui-core.a \ $(FSUI_BUILD_DIR)/libfsui-core.a \
$(FSUI_BUILD_DIR)/libfsui_imgui.a \ $(FSUI_BUILD_DIR)/libfsui_imgui.a \
$(FSUI_BUILD_DIR)/libfsui_resources.a $(FSUI_BUILD_DIR)/libfsui_resources.a
ifeq ($(PSVITA_TARGET),1)
FSUI_LIBS += \
$(FSUI_BUILD_DIR)/libfsui-renderer-opengl.a \
$(FSUI_BUILD_DIR)/libfsui_glad.a
else
ifneq ($(WASM_TARGET),wasm) ifneq ($(WASM_TARGET),wasm)
ifeq ($(FSUI_LINK_OPENGL),1)
FSUI_LIBS += \ FSUI_LIBS += \
$(FSUI_BUILD_DIR)/libfsui-renderer-opengl.a \ $(FSUI_BUILD_DIR)/libfsui-renderer-opengl.a \
$(FSUI_BUILD_DIR)/libfsui_glad.a $(FSUI_BUILD_DIR)/libfsui_glad.a
endif endif
endif
endif
PLATFORM_EXTRA_LDFLAGS := PLATFORM_EXTRA_LDFLAGS :=
PLATFORM_EXTRA_LIBS := PLATFORM_EXTRA_LIBS :=
@@ -251,7 +241,7 @@ ifneq ($(UWP_TARGET),1)
endif endif
else ifneq ($(WASM_TARGET),wasm) else ifneq ($(WASM_TARGET),wasm)
PLATFORM_EXTRA_LIBS += -ldl PLATFORM_EXTRA_LIBS += -ldl
ifeq ($(FSUI_LINK_OPENGL),1) ifeq ($(FSUI_LINK_SYSTEM_GL),1)
PLATFORM_EXTRA_LIBS += -lGL PLATFORM_EXTRA_LIBS += -lGL
endif endif
endif endif
scripts/ci/build-linux-musl-target.sh
+1 -1
View File
@@ -197,7 +197,7 @@ make \
AR="${toolchain_dir}/bin/${toolchain_name}-ar" \ AR="${toolchain_dir}/bin/${toolchain_name}-ar" \
RANLIB="${toolchain_dir}/bin/${toolchain_name}-ranlib" \ RANLIB="${toolchain_dir}/bin/${toolchain_name}-ranlib" \
SDL_STATIC=0 \ SDL_STATIC=0 \
FSUI_LINK_OPENGL=0 \ FSUI_LINK_SYSTEM_GL=0 \
SDL_CFLAGS="$sdl_cflags" \ SDL_CFLAGS="$sdl_cflags" \
SDL_LIBS_DYNAMIC="$sdl_libs" \ SDL_LIBS_DYNAMIC="$sdl_libs" \
FSUI_BUILD_DIR="$fsui_build_dir" \ FSUI_BUILD_DIR="$fsui_build_dir" \