diff options
| author | crueter <crueter@eden-emu.dev> | 2025-08-14 20:30:30 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-08-14 20:30:30 +0200 |
| commit | 3e55dc6352b786532230ceb21754179917541adf (patch) | |
| tree | 2d47b76e1fdeb1061f338daedb38865080a8c9fc /src/android | |
| parent | c36cc0d3ee14bc35cf1aa5d38b3f4fe23da8ff9f (diff) | |
[cmake] refactor: CPM over vcpkg (#250)
Completely replaces vcpkg with CPM for all "system" dependencies. Primarily needed for Android and Windows. Also uses my OpenSSL CI for those two platforms.
In theory, improves configure and build time by a LOT and makes things much easier to manage
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/250
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/app/build.gradle.kts | 3 | ||||
| -rw-r--r-- | src/android/app/src/main/jni/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/android/gradle.properties | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 05d9fb039c..ea0ff5427d 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -170,8 +170,9 @@ android { "-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_BUNDLED_VCPKG=ON", + "-DYUZU_USE_CPM=ON", "-DYUZU_USE_BUNDLED_FFMPEG=ON", "-DYUZU_ENABLE_LTO=ON", "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON" diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt index ec8ae5c57d..1e30b16d96 100644 --- a/src/android/app/src/main/jni/CMakeLists.txt +++ b/src/android/app/src/main/jni/CMakeLists.txt @@ -23,4 +23,8 @@ if (ARCHITECTURE_arm64) target_link_libraries(yuzu-android PRIVATE adrenotools) endif() -set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} yuzu-android) +if (ENABLE_OPENSSL OR ENABLE_WEB_SERVICE) + target_link_libraries(yuzu-android PRIVATE OpenSSL::SSL cpp-jwt::cpp-jwt) +endif() + + set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} yuzu-android) diff --git a/src/android/gradle.properties b/src/android/gradle.properties index ef5fafba03..1da29b6797 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -16,3 +16,4 @@ kotlin.code.style=official kotlin.parallel.tasks.in.project=true # Android Gradle plugin 8.0.2 android.suppressUnsupportedCompileSdk=34 +android.native.buildOutput=verbose
\ No newline at end of file |