Skip to content

Commit 1d8a47d

Browse files
committed
Update gitlab ci for libretro to use cmake
1 parent dc0e9bf commit 1d8a47d

File tree

1 file changed

+21
-28
lines changed

1 file changed

+21
-28
lines changed

.gitlab-ci.yml

+21-28
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
# libretro CI
2+
variables:
3+
GIT_SUBMODULE_STRATEGY: normal
24

35
.core-defs:
46
variables:
5-
GIT_SUBMODULE_STRATEGY: recursive
6-
JNI_PATH: libretro
77
CORENAME: ppsspp
8+
CORE_ARGS: -DLIBRETRO=ON
9+
10+
.linux-defs:
11+
variables:
12+
EXTRA_PATH: lib
813

914
include:
1015
- template: Jobs/Code-Quality.gitlab-ci.yml
1116
- project: 'libretro-infrastructure/ci-templates'
12-
file: '/linux-x64.yml'
17+
file: '/android-cmake.yml'
1318
- project: 'libretro-infrastructure/ci-templates'
14-
file: '/windows-x64-mingw.yml'
15-
- project: 'libretro-infrastructure/ci-templates'
16-
file: '/android-jni.yml'
19+
file: '/linux-cmake.yml'
1720

1821
stages:
1922
- build-prepare
@@ -22,39 +25,29 @@ stages:
2225
- test
2326

2427
#Desktop
25-
libretro-build-linux-x64:
28+
libretro-build-linux-x86_64:
2629
extends:
30+
- .libretro-linux-cmake-x86_64
2731
- .core-defs
28-
- .libretro-linux-x64-make-default
29-
variables:
30-
MAKEFILE_PATH: libretro
31-
MAKEFILE: Makefile
32+
- .linux-defs
3233

33-
libretro-build-windows-x64:
34-
extends:
35-
- .core-defs
36-
- .libretro-windows-x64-mingw-make-default
37-
variables:
38-
MAKEFILE_PATH: libretro
39-
MAKEFILE: Makefile
40-
4134
# Android
42-
android-armeabi-v7a:
35+
libretro-build-android-armeabi-v7a:
4336
extends:
37+
- .libretro-android-cmake-armeabi-v7a
4438
- .core-defs
45-
- .libretro-android-jni-armeabi-v7a
4639

47-
android-arm64-v8a:
40+
libretro-build-android-arm64-v8a:
4841
extends:
42+
- .libretro-android-cmake-arm64-v8a
4943
- .core-defs
50-
- .libretro-android-jni-arm64-v8a
5144

52-
android-x86_64:
45+
libretro-build-android-x86_64:
5346
extends:
47+
- .libretro-android-cmake-x86_64
5448
- .core-defs
55-
- .libretro-android-jni-x86_64
56-
57-
android-x86:
49+
50+
libretro-build-android-x86:
5851
extends:
52+
- .libretro-android-cmake-x86
5953
- .core-defs
60-
- .libretro-android-jni-x86

0 commit comments

Comments
 (0)