diff options
| author | Andre Weissflog <floooh@gmail.com> | 2025-04-05 15:15:48 +0200 |
|---|---|---|
| committer | Andre Weissflog <floooh@gmail.com> | 2025-04-05 15:15:48 +0200 |
| commit | a511b3e1ff07bc7df5e58ab371f1ea5079ccabb9 (patch) | |
| tree | fd5b2b6b71b2521fff41f8e1ee78b5acd48515ed | |
| parent | 43417c3f11ef286a0c4af99433875958f5f483bb (diff) | |
tests: remove the Android OpenSLES builds (those trigger deprecated errors now)
| -rw-r--r-- | tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/CMakePresets.json | 40 | ||||
| -rwxr-xr-x | tests/test_android.sh | 2 |
3 files changed, 0 insertions, 45 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cb1fb1f4..86ddcee1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -125,9 +125,6 @@ macro(configure_common target) if (SOKOL_FORCE_EGL) target_compile_definitions(${target} PRIVATE SOKOL_FORCE_EGL) endif() - if (SOKOL_FORCE_SLES) - target_compile_definitions(${target} PRIVATE SAUDIO_ANDROID_SLES) - endif() target_compile_definitions(${target} PRIVATE ${SOKOL_BACKEND}) target_link_options(${target} PRIVATE ${link_flags}) target_link_libraries(${target} PRIVATE ${system_libs}) diff --git a/tests/CMakePresets.json b/tests/CMakePresets.json index 48765edb..8f05b73d 100644 --- a/tests/CMakePresets.json +++ b/tests/CMakePresets.json @@ -435,38 +435,6 @@ } }, { - "name": "android_sles_debug", - "generator": "Ninja", - "binaryDir": "build/android_sles_debug", - "toolchainFile": "build/android_sdk/ndk-bundle/build/cmake/android.toolchain.cmake", - "cacheVariables": { - "SOKOL_BACKEND": "SOKOL_GLES3", - "ANDROID_ABI": "armeabi-v7a", - "ANDROID_PLATFORM": "android-30", - "CMAKE_BUILD_TYPE": "Debug", - "SOKOL_FORCE_SLES": { - "type": "BOOL", - "value": "ON" - } - } - }, - { - "name": "android_sles_release", - "generator": "Ninja", - "binaryDir": "build/android_sles_release", - "toolchainFile": "build/android_sdk/ndk-bundle/build/cmake/android.toolchain.cmake", - "cacheVariables": { - "SOKOL_BACKEND": "SOKOL_GLES3", - "ANDROID_ABI": "armeabi-v7a", - "ANDROID_PLATFORM": "android-30", - "CMAKE_BUILD_TYPE": "Release", - "SOKOL_FORCE_SLES": { - "type": "BOOL", - "value": "ON" - } - } - }, - { "name": "win_gl", "binaryDir": "build/win_gl", "cacheVariables": { @@ -681,14 +649,6 @@ "configurePreset": "android_release" }, { - "name": "android_sles_debug", - "configurePreset": "android_sles_debug" - }, - { - "name": "android_sles_release", - "configurePreset": "android_sles_release" - }, - { "name": "win_gl_debug", "configurePreset": "win_gl", "configuration": "Debug" diff --git a/tests/test_android.sh b/tests/test_android.sh index 88fb1c9d..fa695d11 100755 --- a/tests/test_android.sh +++ b/tests/test_android.sh @@ -4,5 +4,3 @@ source test_common.sh setup_android build android_debug android_debug build android_release android_release -build android_sles_debug android_sles_debug -build android_sles_release android_sles_release |