From aaa61676f416d9530fd12b4007b3decd8c090bbe Mon Sep 17 00:00:00 2001
From: Aaron Kling <webgeek1234@gmail.com>
Date: Tue, 1 Dec 2020 23:50:32 -0600
Subject: [PATCH] libretro: Update gitlab ci extends ordering
---
.gitlab-ci.yml | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc64ff46..44a7810a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@
variables:
GIT_SUBMODULE_STRATEGY: recursive
JNI_PATH: src/libretro
+ MAKEFILE_PATH: src/libretro
CORENAME: vbam
include:
@@ -26,54 +27,42 @@ stages:
#Desktop
libretro-build-linux-x64:
extends:
- - .core-defs
- .libretro-linux-x64-make-default
- variables:
- MAKEFILE_PATH: src/libretro
- MAKEFILE: Makefile
+ - .core-defs
libretro-build-windows-x64:
extends:
- - .core-defs
- .libretro-windows-x64-mingw-make-default
- variables:
- MAKEFILE_PATH: src/libretro
- MAKEFILE: Makefile
+ - .core-defs
# Android
android-armeabi-v7a:
extends:
- - .core-defs
- .libretro-android-jni-armeabi-v7a
+ - .core-defs
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
android-x86:
extends:
- - .core-defs
- .libretro-android-jni-x86
+ - .core-defs
# Static
libretro-build-libnx-aarch64:
extends:
- - .core-defs
- .libretro-libnx-static-retroarch-master
- variables:
- MAKEFILE_PATH: src/libretro
- MAKEFILE: Makefile
+ - .core-defs
libretro-build-vita:
extends:
- - .core-defs
- .libretro-vita-static-retroarch-master
- variables:
- MAKEFILE_PATH: src/libretro
- MAKEFILE: Makefile
+ - .core-defs