فهرست منبع

tests: remove the Android OpenSLES builds (those trigger deprecated errors now)

Andre Weissflog 3 ماه پیش
والد
کامیت
a511b3e1ff
3فایلهای تغییر یافته به همراه0 افزوده شده و 45 حذف شده
  1. 0 3
      tests/CMakeLists.txt
  2. 0 40
      tests/CMakePresets.json
  3. 0 2
      tests/test_android.sh

+ 0 - 3
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})

+ 0 - 40
tests/CMakePresets.json

@@ -434,38 +434,6 @@
                 "CMAKE_BUILD_TYPE": "Release"
             }
         },
-        {
-            "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",
@@ -680,14 +648,6 @@
             "name": "android_release",
             "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",

+ 0 - 2
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