From 37503f931fca726c6df7a530879730789f270fcf Mon Sep 17 00:00:00 2001 From: Craig Carnell <1188869+cscd98@users.noreply.github.com> Date: Sun, 21 Dec 2025 19:35:50 +0000 Subject: [PATCH] add webOS to Makefile / CI --- .gitlab-ci.yml | 12 ++++++++++++ libretro/Makefile.libretro | 22 +++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55f143ac..00bd2db0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,11 @@ include: - project: 'libretro-infrastructure/ci-templates' file: '/android-jni.yml' + #################################### MISC ################################## + # webOS 32-bit (LGTV) + - project: 'libretro-infrastructure/ci-templates' + file: '/webos-make.yml' + # Stages for building stages: - build-prepare @@ -288,3 +293,10 @@ android-x86: - $NDK_ROOT/ndk-build --no-print-directory -j$NUMPROC -C $JNI_PATH/jni $PLATFORM_ARGS - mv $JNI_PATH/libs/$ANDROID_ABI/libretro.so $LIBNAME - if [ $STRIP_CORE_LIB -eq 1 ]; then $NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip $LIBNAME; fi + +#################################### MISC ################################## +# webOS 32-bit +libretro-build-webos-armv7a: + extends: + - .libretro-webos-armv7a-make-default + - .core-defs diff --git a/libretro/Makefile.libretro b/libretro/Makefile.libretro index ca05cce0..99d68693 100644 --- a/libretro/Makefile.libretro +++ b/libretro/Makefile.libretro @@ -173,6 +173,24 @@ else LDFLAGS += -Wl,-Bdynamic fpic = -fPIC endif + +CORE_DIR := .. +DEPS_BIN_DIR = $(CURDIR)/deps_bin + +# webOS +ifneq (,$(or $(findstring webos,$(CROSS_COMPILE)),$(findstring starfish,$(CROSS_COMPILE)))) + TARGET_TRIPLET = $(patsubst %-,%,$(CROSS_COMPILE)) + WITH_FLUIDSYNTH = 1 + WITH_FAKE_SDL = 1 + ifneq (,$(findstring aarch64,$(CROSS_COMPILE))) + WITH_DYNAREC = arm64 + else + WITH_DYNAREC = arm + endif + INCFLAGS += -I$(DEPS_BIN_DIR)/include -I$(DEPS_BIN_DIR)/munt_build/include -I$(DEPS_BIN_DIR)/opus/include + LDFLAGS += -L$(DEPS_BIN_DIR)/lib +endif + ifeq ($(DEBUG), 1) COMMONFLAGS += -O0 -g CMAKE_BUILD_TYPE = Debug @@ -199,12 +217,10 @@ ifeq ($(WITH_VOODOO), 1) COMMONFLAGS += -DWITH_VOODOO endif -CORE_DIR := .. -INCFLAGS := +INCFLAGS ?= SOURCES_C := SOURCES_CXX := -DEPS_BIN_DIR = $(CURDIR)/deps_bin ifeq ($(BUNDLED_SDL), 1) include deps/sdl.makefile include deps/sdl_net.makefile