From be31d5f56c8c3df26690c3fcaf9a82151966d12a Mon Sep 17 00:00:00 2001 From: Fijxu Date: Tue, 2 Apr 2024 14:12:27 -0300 Subject: [PATCH 1/2] Enable Windows MinGW artifacts. --- .ci/scripts/windows/docker.sh | 9 ++++++--- .forgejo/workflows/verify.yml | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 70eadda41e..a2fb4e3dd1 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -1,6 +1,7 @@ #!/bin/bash -ex # SPDX-FileCopyrightText: 2019 yuzu Emulator Project +# SPDX-FileCopyrightText: 2024 suyu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later set -e @@ -9,12 +10,14 @@ set -e ccache -sv +rm -rf build mkdir -p build && cd build -cmake .. \ +/usr/bin/x86_64-w64-mingw32-cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWCross.cmake" \ -DDISPLAY_VERSION="$1" \ - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ + -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \ + -DSUYU_USE_PRECOMPILED_HEADERS=OFF \ + -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF \ -DENABLE_QT_TRANSLATION=ON \ -DUSE_CCACHE=ON \ -DSUYU_USE_BUNDLED_SDL2=OFF \ diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml index f89166dbde..1292ddcfa9 100644 --- a/.forgejo/workflows/verify.yml +++ b/.forgejo/workflows/verify.yml @@ -63,8 +63,8 @@ jobs: image: linux-fresh - type: linux image: linux-fresh - # - type: windows - # image: linux-mingw + - type: windows + image: linux-mingw container: fijxu/build-environments:${{ matrix.image }} # User 1001 doesn't exists on the images. # options: -u 1001 From 77205848afa64fe346e8357397104d266a553033 Mon Sep 17 00:00:00 2001 From: Crimson Hawk Date: Sat, 6 Apr 2024 13:34:23 -0400 Subject: [PATCH 2/2] Add requested changes Commited by Exverge --- .ci/scripts/windows/docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index a2fb4e3dd1..73e000324c 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -18,6 +18,7 @@ mkdir -p build && cd build -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \ -DSUYU_USE_PRECOMPILED_HEADERS=OFF \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF \ + -DUSE_DISCORD_PRESENCE=ON \ -DENABLE_QT_TRANSLATION=ON \ -DUSE_CCACHE=ON \ -DSUYU_USE_BUNDLED_SDL2=OFF \