Merge remote-tracking branch 'libretro/master'

Signed-off-by: Rafael Kitover <rkitover@gmail.com>

.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:
+    - .core-defs
-    MAKEFILE_PATH: src/libretro
-    MAKEFILE: Makefile
 
 libretro-build-windows-x64:
   extends:
-    - .core-defs
     - .libretro-windows-x64-mingw-make-default
-  variables:
+    - .core-defs
-    MAKEFILE_PATH: src/libretro
-    MAKEFILE: Makefile
     
 # 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:
+    - .core-defs
-    MAKEFILE_PATH: src/libretro
-    MAKEFILE: Makefile
 
 libretro-build-vita:
   extends:
-    - .core-defs
     - .libretro-vita-static-retroarch-master
-  variables:
+    - .core-defs
-    MAKEFILE_PATH: src/libretro
-    MAKEFILE: Makefile