From 9b2520553f5d92d33975b0293d26adb978966fc7 Mon Sep 17 00:00:00 2001
From: Aaron Kling <webgeek1234@gmail.com>
Date: Tue, 1 Dec 2020 19:09:42 -0600
Subject: [PATCH] libretro: Update gitlab ci extends ordering

---
 .gitlab-ci.yml | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 164c78f75..70402c5d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 .core-defs:
   variables:
     JNI_PATH: src/libretro
+    MAKEFILE_PATH: src/libretro
     CORENAME: stella
 
 include:
@@ -23,46 +24,37 @@ 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