Switch FSUI build to system GL

.gitea/workflows/build.yml

@@ -528,7 +528,7 @@ jobs:
             exit 1
           fi
           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
         shell: bash

Makefile

@@ -45,7 +45,7 @@ CONTROLLER_GENERIC ?= 0
 FSUI_DIR := third_party/fsui-lib
 FSUI_BUILD_DIR ?= build/fsui/native
 WASM_HTML_POSTPROCESS := $(FSUI_DIR)/cmake/postprocess_web_html.cmake
-FSUI_LINK_OPENGL ?= 1
+FSUI_LINK_SYSTEM_GL ?= 1
 
 ifeq ($(PSVITA_TARGET),1)
 	ifeq ($(strip $(VITASDK)),)
@@ -217,21 +217,11 @@ FSUI_LIBS := \
 	$(FSUI_BUILD_DIR)/libfsui-core.a \
 	$(FSUI_BUILD_DIR)/libfsui_imgui.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)
-ifeq ($(FSUI_LINK_OPENGL),1)
 FSUI_LIBS += \
 	$(FSUI_BUILD_DIR)/libfsui-renderer-opengl.a \
 	$(FSUI_BUILD_DIR)/libfsui_glad.a
 endif
-endif
-endif
 
 PLATFORM_EXTRA_LDFLAGS :=
 PLATFORM_EXTRA_LIBS :=
@@ -251,7 +241,7 @@ ifneq ($(UWP_TARGET),1)
 endif
 else ifneq ($(WASM_TARGET),wasm)
 	PLATFORM_EXTRA_LIBS += -ldl
-ifeq ($(FSUI_LINK_OPENGL),1)
+ifeq ($(FSUI_LINK_SYSTEM_GL),1)
 	PLATFORM_EXTRA_LIBS += -lGL
 endif
 endif

scripts/ci/build-linux-musl-target.sh

@@ -197,7 +197,7 @@ make \
     AR="${toolchain_dir}/bin/${toolchain_name}-ar" \
     RANLIB="${toolchain_dir}/bin/${toolchain_name}-ranlib" \
     SDL_STATIC=0 \
-    FSUI_LINK_OPENGL=0 \
+    FSUI_LINK_SYSTEM_GL=0 \
     SDL_CFLAGS="$sdl_cflags" \
     SDL_LIBS_DYNAMIC="$sdl_libs" \
     FSUI_BUILD_DIR="$fsui_build_dir" \