瀏覽代碼

remove uwp support from tests

Andre Weissflog 2 年之前
父節點
當前提交
a2d811356a
共有 5 個文件被更改,包括 4 次插入20 次删除
  1. 0 9
      .github/workflows/main.yml
  2. 1 5
      tests/CMakeLists.txt
  3. 2 2
      tests/compile/CMakeLists.txt
  4. 1 1
      tests/functional/CMakeLists.txt
  5. 0 3
      tests/test_uwp.cmd

+ 0 - 9
.github/workflows/main.yml

@@ -63,12 +63,3 @@ jobs:
           run: |
             cd tests
             ./test_android.sh
-    uwp:
-        runs-on: windows-latest
-        steps:
-        - uses: actions/checkout@v3
-        - name: test_uwp
-          run: |
-            cd tests
-            test_uwp.cmd
-          shell: cmd

+ 1 - 5
tests/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 project(sokol-test)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 17)  # needed for UWP
+set(CMAKE_CXX_STANDARD 11)
 
 # SOKOL_GLCORE33, SOKOL_GLES2, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU, SOKOL_DUMMY
 set(SOKOL_BACKEND "SOKOL_DUMMY_BACKEND" CACHE STRING "Select 3D backend API")
@@ -22,8 +22,6 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL Linux)
     set(LINUX 1)
 elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin)
     set(OSX_MACOS 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
-    set(UWP 1)
 elseif (CMAKE_SYSTEM_NAME STREQUAL Windows)
     set(WINDOWS 1)
 else()
@@ -110,8 +108,6 @@ elseif (OSX_MACOS)
     else()
         set(system_libs ${system_libs} "-framework OpenGL")
     endif()
-elseif (UWP)
-    set(exe_type WIN32)
 elseif (WINDOWS)
     set(exe_type WIN32)
 endif()

+ 2 - 2
tests/compile/CMakeLists.txt

@@ -15,7 +15,7 @@ set(c_sources
     sokol_color.c
     sokol_spine.c
     sokol_main.c)
-if (NOT ANDROID AND NOT UWP)
+if (NOT ANDROID)
     set(c_sources ${c_sources} sokol_fetch.c)
 endif()
 
@@ -35,7 +35,7 @@ set(cxx_sources
     sokol_color.cc
     sokol_spine.cc
     sokol_main.cc)
-if (NOT ANDROID AND NOT UWP)
+if (NOT ANDROID)
     set(cxx_sources ${cxx_sources} sokol_fetch.cc)
 endif()
 

+ 1 - 1
tests/functional/CMakeLists.txt

@@ -1,4 +1,4 @@
-if (NOT ANDROID AND NOT UWP)
+if (NOT ANDROID)
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets/comsi.s3m DESTINATION ${CMAKE_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets/comsi.s3m DESTINATION ${CMAKE_BINARY_DIR}/Debug)

+ 0 - 3
tests/test_uwp.cmd

@@ -1,3 +0,0 @@
-cmake --preset win_uwp || exit /b 10
-cmake --build --preset win_uwp_debug || exit /b 10
-cmake --build --preset win_uwp_release || exit /b 10