From 7fa64f478143c78c2422a6719331173f37c462e4 Mon Sep 17 00:00:00 2001 From: BearOso Date: Fri, 3 Feb 2023 16:31:31 -0600 Subject: [PATCH] See if this works for CI fixes. --- .cirrus.yml | 2 +- appveyor.yml | 18 +++++++++--------- libretro/libretro-win32.vcxproj | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index a7eb92bc..c7aad02b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -13,7 +13,7 @@ snes9x_linux-gtk-amd64_task: - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install meson gettext libsdl2-dev libgtkmm-3.0-dev libgtk-3-dev libminizip-dev portaudio19-dev glslang-dev cmake compile_script: - - meson build gtk --buildtype=release --strip + - cmake -G Ninja -B build -S gtk -DCMAKE_BUILD_TYPE=Release - ninja -j2 -C build package_script: diff --git a/appveyor.yml b/appveyor.yml index 59c2f172..b7583700 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,36 +1,36 @@ version: 1.61-{build} -image: Visual Studio 2017 +image: Visual Studio 2022 environment: matrix: - - generator: "Visual Studio 15" + - generator: "Visual Studio 2022" config: Release Unicode platform: Win32 arch: win32 output: win32\snes9x.exe - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - - generator: "Visual Studio 15" + - generator: "Visual Studio 2022" config: Release Unicode platform: x64 arch: win32-x64 output: win32\snes9x-x64.exe - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - - generator: "Visual Studio 15" + - generator: "Visual Studio 2022" config: libretro Release platform: Win32 arch: libretro output: libretro\Win32\libretro Release\snes9x_libretro.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - - generator: "Visual Studio 15" + - generator: "Visual Studio 2022" config: libretro Release platform: x64 arch: libretro-x64 output: libretro\x64\libretro Release\snes9x_libretro.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 init: - git config --global core.autocrlf input diff --git a/libretro/libretro-win32.vcxproj b/libretro/libretro-win32.vcxproj index eb466508..947ec7f8 100644 --- a/libretro/libretro-win32.vcxproj +++ b/libretro/libretro-win32.vcxproj @@ -311,6 +311,7 @@ +