liberodark/eden
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix rebase mistake

Browse source
This commit is contained in:
inix 2025-10-16 04:47:00 +02:00 • committed by Inix
parent 5801ce681d
commit 58af58774d
1 changed files with 5 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/android/app/build.gradle.kts
View file

@ -75,7 +75,10 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
val extraCMakeArgs = (project.findProperty("YUZU_ANDROID_ARGS") as String?)?.split("\\s+".toRegex()) ?: emptyList() val extraCMakeArgs = (project.findProperty("YUZU_ANDROID_ARGS") as String?)?.split("\\s+".toRegex()) ?: emptyList()
val enableUpdater = when (System.getenv("DEVEL")) {
"false" -> "ON"
else -> "OFF"
}
arguments.addAll(listOf( arguments.addAll(listOf(
"-DENABLE_QT=0", // Don't use QT "-DENABLE_QT=0", // Don't use QT
"-DENABLE_SDL2=0", // Don't use SDL "-DENABLE_SDL2=0", // Don't use SDL
@ -89,6 +92,7 @@ android {
"-DBUILD_TESTING=OFF", "-DBUILD_TESTING=OFF",
"-DYUZU_TESTS=OFF", "-DYUZU_TESTS=OFF",
"-DDYNARMIC_TESTS=OFF", "-DDYNARMIC_TESTS=OFF",
"-DENABLE_UPDATE_CHECKER=$enableUpdater"
*extraCMakeArgs.toTypedArray() *extraCMakeArgs.toTypedArray()
)) ))
@ -226,34 +230,6 @@ android {
} }
} }
defaultConfig {
externalNativeBuild {
cmake {
val enableUpdater = when (System.getenv("DEVEL")) {
"false" -> "ON"
else -> "OFF"
}
arguments(
"-DENABLE_QT=0", // Don't use QT
"-DENABLE_SDL2=0", // Don't use SDL
"-DENABLE_WEB_SERVICE=1", // Enable web service
"-DENABLE_OPENSSL=ON",
"-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work
"-DYUZU_USE_CPM=ON",
"-DCPMUTIL_FORCE_BUNDLED=ON",
"-DYUZU_USE_BUNDLED_FFMPEG=ON",
"-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
"-DBUILD_TESTING=OFF",
"-DYUZU_TESTS=OFF",
"-DDYNARMIC_TESTS=OFF",
"-DENABLE_UPDATE_CHECKER=$enableUpdater"
)
abiFilters("arm64-v8a")
}
}
}
}
tasks.register<Delete>("ktlintReset", fun Delete.() { tasks.register<Delete>("ktlintReset", fun Delete.() {
delete(File(layout.buildDirectory.toString() + File.separator + "intermediates/ktLint")) delete(File(layout.buildDirectory.toString() + File.separator + "intermediates/ktLint"))