From 3fa3298a31c5e569c36e71d144bda63b9f969b20 Mon Sep 17 00:00:00 2001 From: digant73 Date: Wed, 16 Oct 2024 13:12:12 +0200 Subject: [PATCH] fixed CI for building on windows --- .ci/setup-windows.sh | 6 +++--- BUILDING.md | 8 +++----- rpcs3/rpcs3.vcxproj | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh index 2564ae3955..4772b0de18 100755 --- a/.ci/setup-windows.sh +++ b/.ci/setup-windows.sh @@ -68,7 +68,7 @@ download_and_verify() } # Some dependencies install here -[ -d "./lib" ] || mkdir "./lib" +[ -d "./build/lib_ext/Release-x64" ] || mkdir "./build/lib_ext/Release-x64" for url in $DEP_URLS; do # Get the filename from the URL and remove query strings (?arg=something). @@ -78,8 +78,8 @@ for url in $DEP_URLS; do # shellcheck disable=SC1003 case "$url" in *qt*) checksum=$(curl -fL "${url}.sha1"); algo="sha1"; outDir='C:\Qt\' ;; - *llvm*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./3rdparty/llvm" ;; - *glslang*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./lib/Release-x64" ;; + *llvm*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./build/lib_ext/Release-x64" ;; + *glslang*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./build/lib_ext/Release-x64" ;; *Vulkan*) # Vulkan setup needs to be run in batch environment # Need to subshell this or else it doesn't wait diff --git a/BUILDING.md b/BUILDING.md index a83b790527..4d0758005c 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -127,11 +127,9 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r **NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`) -To speed up the compilation time, you may want to download and install some of the following precompiled libs: -- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z): extract them to `\build\lib_ext\<$(Configuration)>-x64` - (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) -- [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z): extract them to `\build\lib_ext\<$(Configuration)>-x64\glslang` - (e.g. `c:\rpcs3\build\lib_ext\Release-x64\glslang`; the path needs to be created) +To speed up the compilation time, you may want to download and extract to `\build\lib_ext\<$(Configuration)>-x64` (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) some of the following precompiled libs: +- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z) +- [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z) **NOTES:** - `<$(Configuration)>` can assume values `Release` or `Debug`. diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index eff6850c1d..dccdb9d2b9 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -90,7 +90,7 @@ opencv_world4100.lib;DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;MachineIndependent.lib;GenericCodeGen.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Core.lib;Qt6Gui.lib;Qt6Widgets.lib;Qt6Concurrent.lib;Qt6Multimedia.lib;Qt6MultimediaWidgets.lib;Qt6Svg.lib;Qt6SvgWidgets.lib;7zip.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;%(AdditionalDependencies) - $(SolutionDir)3rdparty\opencv\opencv\opencv410\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)build\lib_ext\$(CONFIGURATION)-$(PLATFORM)\glslang;$(SolutionDir)3rdparty\discord-rpc\lib;$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories) + $(SolutionDir)3rdparty\opencv\opencv\opencv410\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)build\lib_ext\$(CONFIGURATION)-$(PLATFORM);$(SolutionDir)3rdparty\discord-rpc\lib;$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true Debug