summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjdgleaver2020-12-03 12:09:53 +0000
committerm4xw2020-12-03 14:05:54 +0100
commite4745d32ec0a99539a69b92560ae66ca76e7747e (patch)
tree6a076fd0f7d2b46b4ee8ac3556560e1467359192
parent78f7c59d5f7d5381c1c4c97367a87cbd68216d18 (diff)
downloadpicogpsp-e4745d32ec0a99539a69b92560ae66ca76e7747e.tar.gz
picogpsp-e4745d32ec0a99539a69b92560ae66ca76e7747e.tar.bz2
picogpsp-e4745d32ec0a99539a69b92560ae66ca76e7747e.zip
Add 3DS target to .gitlab-ci.yml
-rw-r--r--.gitlab-ci.yml21
-rw-r--r--Makefile2
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
@@ -12,6 +12,8 @@ include:
- 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'
file: '/windows-x64-mingw.yml'
@@ -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=<path to>ctrulib")
+$(error "Please set CTRULIB in your environment. export CTRULIB=<path to>libctru")
endif
CFLAGS += -I$(CTRULIB)/include