VERY experimental Nintendo Switch 2 emulator
C++
windows actions (again) (#39)
swurlc8a4cf715f08
diff --git a/.github/workflows/build.yml b/.github/workflows/build.ymlindex 3050809f8c..b67fa71119 100644--- a/.github/workflows/build.yml+++ b/.github/workflows/build.yml@@ -4,9 +4,9 @@ name: eden-buildon:push:- branches: [ "*" ]+ branches: [ "master" ]tags: [ "*" ]- pull_request_target:+ pull_request:branches: [ master ]jobs:@@ -25,7 +25,7 @@ jobs:name: source.zippath: artifacts/windows:- runs-on: windows-latest+ runs-on: windowsstrategy:matrix:target: ["msvc"] # TODO: Add msys2@@ -42,8 +42,7 @@ jobs:- uses: actions/checkout@v4with:submodules: recursive- fetch-depth: 1- fetch-tags: true+ fetch-depth: 0- name: Set up vcpkg cacheuses: actions/cache@v4@@ -57,21 +56,24 @@ jobs:${{ runner.os }}-${{ matrix.target }}-vcpkg-- name: Set up MSVC- uses: ilammy/msvc-dev-cmd@v1+ uses: https://github.com/ilammy/msvc-dev-cmd@v1if: ${{ matrix.target == 'msvc' }}- - name: Install extra tools- run: choco install ccache ninja wget cygwin- if: ${{ matrix.target == 'msvc' }}- - name: Install vulkan-SDK- run: ./.ci/install-vulkan-sdk.ps1- shell: pwsh++# - name: Install extra tools+# run: choco install ccache ninja wget cygwin+# if: ${{ matrix.target == 'msvc' }}++# - name: Install vulkan-SDK+# run: ./.ci/install-vulkan-sdk.ps1+# shell: powershell+- name: Cygwin with autoconf # NEEDED FOR LIBUSBshell: cmdrun: |C:\tools\cygwin\cygwinsetup.exe -q -P autoconf,automake,libtool,make,pkg-configREM Create wrapper batch files for Cygwin tools in a directory that will be in PATH- mkdir C:\cygwin-wrappers+ REM mkdir C:\cygwin-wrappersREM Create autoconf.bat wrapperecho @echo off > C:\cygwin-wrappers\autoconf.bat@@ -84,6 +86,7 @@ jobs:REM Add the wrappers directory to PATHecho C:\cygwin-wrappers>>"%GITHUB_PATH%"echo C:\tools\cygwin\bin>>"%GITHUB_PATH%"+- name: CMake Configureid: cmakeshell: cmd@@ -91,16 +94,18 @@ jobs:mkdir buildcd buildcmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_TOOLCHAIN_FILE="%CD%\..\CMakeModules\MSVCCache.cmake" -DYUZU_USE_BUNDLED_QT=ON -DENABLE_QT_TRANSLATION=ON -DUSE_DISCORD_PRESENCE=ON -DYUZU_USE_BUNDLED_VCPKG=ON -DYUZU_USE_BUNDLED_SDL2=ON -DUSE_CCACHE=ON+- name: Buildid: buildshell: cmdrun: |cd build- ninja yuzu yuzu-cmd yuzu-room tests -j4+ ninja yuzu yuzu-cmd yuzu-room testsccache -s -v+- name: Package artifactsif: steps.build.outcome == 'success'- shell: pwsh+ shell: powershellrun: |$GITDATE = $(git show -s --date=short --format='%ad') -replace "-", ""$GITREV = $(git show -s --format='%h')@@ -137,6 +142,7 @@ jobs:Copy-Item "LICENSE*" -Destination "$RELEASE_DIST" -ErrorAction SilentlyContinueCopy-Item "README*" -Destination "$RELEASE_DIST" -ErrorAction SilentlyContinue+- name: Upload Windows artifactsif: steps.build.outcome == 'success'uses: forgejo/upload-artifact@v4diff --git a/.github/workflows/license-header.yml b/.github/workflows/license-header.ymlindex c653480e63..e07be810dd 100644--- a/.github/workflows/license-header.yml+++ b/.github/workflows/license-header.yml@@ -11,9 +11,12 @@ jobs:- uses: actions/checkout@v4with:fetch-depth: 0+- name: Fetch master branchrun: git fetch origin master:master+- name: Make script executablerun: chmod +x ./.ci/license-header.rb+- name: Check license headersrun: ./.ci/license-header.rbdiff --git a/src/core/hle/service/am/process_creation.cpp b/src/core/hle/service/am/process_creation.cppindex 81a8fb0b44..b5e31353a2 100644--- a/src/core/hle/service/am/process_creation.cpp+++ b/src/core/hle/service/am/process_creation.cpp@@ -106,7 +106,7 @@ std::unique_ptr<Process> CreateApplicationProcess(std::vector<u8>& out_control,out_control = nacp.GetRawBytes();} else {out_control.resize(sizeof(FileSys::RawNACP));- std::fill(out_control.begin(), out_control.end(), 0);+ std::fill(out_control.begin(), out_control.end(), (u8) 0);}auto& storage = system.GetContentProviderUnion();