From e4745d32ec0a99539a69b92560ae66ca76e7747e Mon Sep 17 00:00:00 2001 From: jdgleaver Date: Thu, 3 Dec 2020 12:09:53 +0000 Subject: Add 3DS target to .gitlab-ci.yml --- .gitlab-ci.yml | 21 ++++++++++++++------- Makefile | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79bd340..e13aca5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,8 @@ include: file: '/vita-static.yml' - project: 'libretro-infrastructure/ci-templates' file: '/psp-static.yml' + - project: 'libretro-infrastructure/ci-templates' + file: '/ctr-static.yml' - project: 'libretro-infrastructure/ci-templates' file: '/linux-x64.yml' - project: 'libretro-infrastructure/ci-templates' @@ -29,37 +31,42 @@ stages: #Desktop libretro-build-linux-x64: extends: - - .core-defs - .libretro-linux-x64-make-default + - .core-defs libretro-build-windows-x64: extends: - - .core-defs - .libretro-windows-x64-mingw-make-default + - .core-defs libretro-build-dingux-i386: extends: - - .core-defs - .libretro-dingux-i386-make-default + - .core-defs # Android android-arm64-v8a: extends: - - .core-defs - .libretro-android-jni-arm64-v8a + - .core-defs android-x86_64: extends: - - .core-defs - .libretro-android-jni-x86_64 + - .core-defs # Static libretro-build-vita: extends: - - .core-defs - .libretro-vita-static-retroarch-master + - .core-defs libretro-build-psp: extends: - - .core-defs - .libretro-psp-static-retroarch-master + - .core-defs + +libretro-build-ctr: + extends: + - .libretro-ctr-static-retroarch-master + - .core-defs diff --git a/Makefile b/Makefile index cad71fa..4d88887 100644 --- a/Makefile +++ b/Makefile @@ -478,7 +478,7 @@ ifeq ($(HAVE_DYNAREC), 1) OBJECTS += 3ds/3ds_utils.o 3ds/3ds_cache_utils.o ifeq ($(strip $(CTRULIB)),) -$(error "Please set CTRULIB in your environment. export CTRULIB=ctrulib") +$(error "Please set CTRULIB in your environment. export CTRULIB=libctru") endif CFLAGS += -I$(CTRULIB)/include -- cgit v1.2.3