Skip to content

add webOS to Makefile / CI #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cscd98 wants to merge 1 commit into
base: libretro
Choose a base branch
from
Open

add webOS to Makefile / CI #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
22 changes: 19 additions & 3 deletions libretro/Makefile.libretro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down