From 364778e7a0215371802546b90f065b220238ca9b Mon Sep 17 00:00:00 2001 From: Lyelye150 Date: Tue, 21 Oct 2025 18:15:59 -0400 Subject: [PATCH] Update on ci.yml --- .github/workflows/ci.yml | 4 ++-- ISLE/isleapp.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43c2912b..82177662 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: - { name: 'iOS', os: 'macos-15', generator: 'Xcode', dx5: false, config: false, brew: true, werror: true, clang-tidy: false, cmake-args: '-DCMAKE_SYSTEM_NAME=iOS', ios: true } - { name: 'Emscripten', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, emsdk: true, werror: true, clang-tidy: false, cmake-wrapper: 'emcmake' } - { name: 'Nintendo 3DS', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, n3ds: true, werror: true, clang-tidy: false, container: 'devkitpro/devkitarm:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake' } - - { name: 'Nintendo Wii U', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, wiiu: true, werror: false, clang-tidy: false, container: 'devkitpro/devkitppc:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake', use_sdl2: true } + - { name: 'Nintendo Wii U', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, wiiu: true, werror: false, clang-tidy: false, container: 'devkitpro/devkitppc:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake', sdl2: true } - { name: 'Xbox One', os: 'windows-latest', generator: 'Visual Studio 17 2022', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', cmake-args: '-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.26100.0', xbox-one: true} - { name: 'Android', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, android: true, werror: true, clang-tidy: false,} steps: @@ -169,7 +169,7 @@ jobs: -DENABLE_CLANG_TIDY=${{ !!matrix.clang-tidy }} \ -DISLE_WERROR=${{ !!matrix.werror }} \ -DISLE_DEBUG=${{ matrix.debug || 'OFF' }} \ - -Werror=dev + ${{ matrix.sdl2 && '-DUSE_SDL2=ON' || '-Werror=dev' }} - name: Build (CMake) if: ${{ !matrix.android }} diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index c261cf24..313bd11b 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -898,7 +898,7 @@ MxResult IsleApp::SetupWindow() SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_FULLSCREEN_BOOLEAN, m_fullScreen); SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING, WINDOW_TITLE); #endif -#if defined(MINIWIN) && !defined(__3DS__) && !defined(WINDOWS_STORE && !defined(__WIIU__)) +#if defined(MINIWIN) && !defined(__3DS__) && !defined(WINDOWS_STORE) && !defined(__WIIU__) #if SDL_MAJOR_VERSION >= 3 SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_OPENGL_BOOLEAN, true); #endif