From 0fb4823456910b45ecdc19e6074e4ad916217bf1 Mon Sep 17 00:00:00 2001 From: mahoneyt944 <49591133+mahoneyt944@users.noreply.github.com> Date: Wed, 7 Apr 2021 05:20:07 -0400 Subject: [PATCH] OpenDingux support (#1019) --- .gitlab-ci.yml | 16 ++++++++++++++++ Makefile | 5 ++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1014899a..7f9e94c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,6 +87,10 @@ include: - project: 'libretro-infrastructure/ci-templates' file: '/libnx-static.yml' + # OpenDingux + - project: 'libretro-infrastructure/ci-templates' + file: '/dingux-mips32.yml' + # tvOS (AppleTV) - project: 'libretro-infrastructure/ci-templates' file: '/tvos-arm64.yml' @@ -245,6 +249,18 @@ libretro-build-libnx-aarch64: - .libretro-libnx-static-retroarch-master - .core-defs +# OpenDingux +libretro-build-dingux-mips32: + extends: + - .libretro-dingux-mips32-make-default + - .core-defs + +# OpenDingux Beta +libretro-build-dingux-odbeta-mips32: + extends: + - .libretro-dingux-odbeta-mips32-make-default + - .core-defs + #################################### MISC #################################### # Emscripten libretro-build-emscripten: diff --git a/Makefile b/Makefile index 582d1b71..f700d6f0 100644 --- a/Makefile +++ b/Makefile @@ -468,14 +468,13 @@ else ifneq (,$(findstring armv,$(platform))) # GCW0 else ifeq ($(platform), gcw0) TARGET := $(TARGET_NAME)_libretro.so - CC = /opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc-4.9.1 + CC = /opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc CXX = /opt/gcw0-toolchain/usr/bin/mipsel-linux-g++ AR = /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar LDFLAGS += -shared -Wl,--version-script=link.T -Wl,-no-undefined PLATCFLAGS += -D__GCW0__ - LIBS := -lc -lgcc + LIBS := -lc -lgcc -lm fpic := -fPIC -nostdlib - LIBS = CFLAGS += -lm -march=mips32 -mtune=mips32r2 -mhard-float # Emscripten