mirror of
https://github.com/citra-emu/citra.git
synced 2024-12-18 16:30:05 +00:00
build.gradle: Bump Cmake version and NDK version
This commit is contained in:
parent
0e347605e1
commit
cd4ef8611c
@ -11,6 +11,7 @@ def abiFilter = "arm64-v8a" //, "x86"
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 29
|
compileSdkVersion 29
|
||||||
|
ndkVersion "23.1.7779620"
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
@ -84,7 +85,7 @@ android {
|
|||||||
|
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
version "3.10.2"
|
version "3.18.1"
|
||||||
path "../../../CMakeLists.txt"
|
path "../../../CMakeLists.txt"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -131,7 +132,7 @@ def getVersion() {
|
|||||||
versionName = 'git describe --always --long'.execute([], project.rootDir).text
|
versionName = 'git describe --always --long'.execute([], project.rootDir).text
|
||||||
.trim()
|
.trim()
|
||||||
.replaceAll(/(-0)?-[^-]+$/, "")
|
.replaceAll(/(-0)?-[^-]+$/, "")
|
||||||
} catch (Exception e) {
|
} catch (Exception) {
|
||||||
logger.error('Cannot find git, defaulting to dummy version number')
|
logger.error('Cannot find git, defaulting to dummy version number')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user