lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add 3DS target to .gitlab-ci.yml

This commit is contained in:
jdgleaver 2020-12-03 12:09:53 +00:00 committed by m4xw
parent 78f7c59d5f
commit e4745d32ec
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.gitlab-ci.yml
View File

@ -11,6 +11,8 @@ include:
file: '/vita-static.yml' file: '/vita-static.yml'
- project: 'libretro-infrastructure/ci-templates' - project: 'libretro-infrastructure/ci-templates'
file: '/psp-static.yml' file: '/psp-static.yml'
- project: 'libretro-infrastructure/ci-templates'
file: '/ctr-static.yml'
- project: 'libretro-infrastructure/ci-templates' - project: 'libretro-infrastructure/ci-templates'
file: '/linux-x64.yml' file: '/linux-x64.yml'
- project: 'libretro-infrastructure/ci-templates' - project: 'libretro-infrastructure/ci-templates'
@ -29,37 +31,42 @@ stages:
#Desktop #Desktop
libretro-build-linux-x64: libretro-build-linux-x64:
extends: extends:
- .core-defs
- .libretro-linux-x64-make-default - .libretro-linux-x64-make-default
- .core-defs
libretro-build-windows-x64: libretro-build-windows-x64:
extends: extends:
- .core-defs
- .libretro-windows-x64-mingw-make-default - .libretro-windows-x64-mingw-make-default
- .core-defs
libretro-build-dingux-i386: libretro-build-dingux-i386:
extends: extends:
- .core-defs
- .libretro-dingux-i386-make-default - .libretro-dingux-i386-make-default
- .core-defs
# Android # Android
android-arm64-v8a: android-arm64-v8a:
extends: extends:
- .core-defs
- .libretro-android-jni-arm64-v8a - .libretro-android-jni-arm64-v8a
- .core-defs
android-x86_64: android-x86_64:
extends: extends:
- .core-defs
- .libretro-android-jni-x86_64 - .libretro-android-jni-x86_64
- .core-defs
# Static # Static
libretro-build-vita: libretro-build-vita:
extends: extends:
- .core-defs
- .libretro-vita-static-retroarch-master - .libretro-vita-static-retroarch-master
- .core-defs
libretro-build-psp: libretro-build-psp:
extends: extends:
- .core-defs
- .libretro-psp-static-retroarch-master - .libretro-psp-static-retroarch-master
- .core-defs
libretro-build-ctr:
extends:
- .libretro-ctr-static-retroarch-master
- .core-defs

2
Makefile
View File

@ -478,7 +478,7 @@ ifeq ($(HAVE_DYNAREC), 1)
OBJECTS += 3ds/3ds_utils.o 3ds/3ds_cache_utils.o OBJECTS += 3ds/3ds_utils.o 3ds/3ds_cache_utils.o
ifeq ($(strip $(CTRULIB)),) 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 endif
CFLAGS += -I$(CTRULIB)/include CFLAGS += -I$(CTRULIB)/include