From 4a38abf3e3318dc92ae9a3666c163099a973edbf Mon Sep 17 00:00:00 2001 From: crueter Date: Sat, 25 Oct 2025 01:38:06 -0400 Subject: [PATCH] fix headers, msys2 dep docs Signed-off-by: crueter --- CMakeModules/MSVCCache.cmake | 3 +++ docs/Deps.md | 27 ++++++++++++++++++++++----- src/core/hle/service/mm/mm_u.cpp | 3 +++ src/core/hle/service/nim/nim.cpp | 3 +++ 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/CMakeModules/MSVCCache.cmake b/CMakeModules/MSVCCache.cmake index a4770862fe..8ffc474693 100644 --- a/CMakeModules/MSVCCache.cmake +++ b/CMakeModules/MSVCCache.cmake @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +# SPDX-License-Identifier: GPL-3.0-or-later + # SPDX-FileCopyrightText: 2022 yuzu Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/docs/Deps.md b/docs/Deps.md index 466f27f44e..b082c5d780 100644 --- a/docs/Deps.md +++ b/docs/Deps.md @@ -26,6 +26,9 @@ If you are on desktop and plan to use the Qt frontend, you *must* install Qt 6, * Linux and macOS users may choose to use the installer as well. * MSYS2 can also install Qt 6 via the package manager +If you are on Windows, a convenience script to install MSVC, MSYS2, Qt, all necessary packages for MSYS2, and set up a zsh environment with useful keybinds and aliases can be found [here](https://git.crueter.xyz/scripts/windev). +- For help setting up Qt Creator, run `./install.sh -h qtcreator` + If you are on Windows and NOT building with MSYS2, you may go [back home](Build.md) and continue. ## Externals @@ -204,12 +207,26 @@ Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/l MSYS2 * Open the `MSYS2 MinGW 64-bit` shell (`mingw64.exe`) -* Download and install all dependencies using: - * `pacman -Syu git make mingw-w64-x86_64-SDL2 mingw-w64-x86_64-cmake mingw-w64-x86_64-python-pip mingw-w64-x86_64-qt6 mingw-w64-x86_64-toolchain autoconf libtool automake-wrapper` -* Add MinGW binaries to the PATH: +* Download and install all dependencies: +``` +BASE="git make autoconf libtool automake-wrapper" +MINGW="SDL2 cmake python-pip qt6-base toolchain ffmpeg boost catch fmt lz4 nlohmann-json openssl zlib zstd enet opus mbedtls vulkan-devel libusb vulkan-memory-allocator unordered_dense zydis clang ccache" + +packages="$BASE" +for pkg in $MINGW; do + packages="$packages mingw-w64-x86_64-$pkg" +done + +pacman -Syu --needed --noconfirm $packages +``` +* Notes: + - Using `qt6-static` is possible but currently untested. + - Other environments are entirely untested, but should theoretically work provided you install all the necessary packages. + - Clang is installed as it generally works better here. You can compile with GCC just fine, however. + - Add `qt-creator` to the `MINGW` variable to install Qt Creator. You can then create a Start Menu shortcut to the MinGW Qt Creator by running `powershell "\$s=(New-Object -COM WScript.Shell).CreateShortcut('C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\Qt Creator.lnk');\$s.TargetPath='C:\\msys64\\mingw64\\bin\\qtcreator.exe';\$s.Save()"` in Git Bash or MSYS2. +* Add MinGW binaries to the PATH if they aren't already: * `echo 'PATH=/mingw64/bin:$PATH' >> ~/.bashrc` -* Add VulkanSDK to the PATH: - * `echo 'PATH=$(readlink -e /c/VulkanSDK/*/Bin/):$PATH' >> ~/.bashrc` + * or `echo 'PATH=/mingw64/bin:$PATH' >> ~/.zshrc`
diff --git a/src/core/hle/service/mm/mm_u.cpp b/src/core/hle/service/mm/mm_u.cpp index da9fbc98fc..a5195da061 100644 --- a/src/core/hle/service/mm/mm_u.cpp +++ b/src/core/hle/service/mm/mm_u.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp index fc7dda26f1..98a01308a0 100644 --- a/src/core/hle/service/nim/nim.cpp +++ b/src/core/hle/service/nim/nim.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later