RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-06 07:12:28 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

deploy with windeployqt after all

Browse source
This commit is contained in:
Megamouse 2025-07-13 15:27:33 +02:00
parent e09ceb4f18
commit 73bea0cfc6
3 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.ci/build-windows-clang-cl.ps1
View file

@ -57,6 +57,7 @@ $VcpkgTriplet=$env:VCPKG_TRIPLET
$VcpkgInstall="$VcpkgRoot/installed/$VcpkgTriplet" $VcpkgInstall="$VcpkgRoot/installed/$VcpkgTriplet"
$VcpkgInclude="$VcpkgInstall/include" $VcpkgInclude="$VcpkgInstall/include"
$VcpkgLib="$VcpkgInstall/lib" $VcpkgLib="$VcpkgInstall/lib"
$VcpkgWindeployqt="$VcpkgInstall/tools/qt6/bin/windeployqt6.exe"
# Configure git safe directory # Configure git safe directory
Write-Host "Configuring git safe directory" Write-Host "Configuring git safe directory"
@ -97,9 +98,9 @@ Write-Host "Running CMake configuration"
-DCMAKE_TOOLCHAIN_FILE="$VcpkgRoot/scripts/buildsystems/vcpkg.cmake" ` -DCMAKE_TOOLCHAIN_FILE="$VcpkgRoot/scripts/buildsystems/vcpkg.cmake" `
-DCMAKE_EXE_LINKER_FLAGS="/LIBPATH:$clangBuiltinsDirShort /defaultlib:$clangBuiltinsLib" ` -DCMAKE_EXE_LINKER_FLAGS="/LIBPATH:$clangBuiltinsDirShort /defaultlib:$clangBuiltinsLib" `
-DCMAKE_MT="$mtExePath" ` -DCMAKE_MT="$mtExePath" `
-DWINDEPLOYQT_EXECUTABLE="$VcpkgWindeployqt" `
-DUSE_NATIVE_INSTRUCTIONS=OFF ` -DUSE_NATIVE_INSTRUCTIONS=OFF `
-DUSE_PRECOMPILED_HEADERS=OFF ` -DUSE_PRECOMPILED_HEADERS=OFF `
-DVCPKG_INSTALL_DIR="$VcpkgInstall" `
-DVCPKG_TARGET_TRIPLET="$VcpkgTriplet" ` -DVCPKG_TARGET_TRIPLET="$VcpkgTriplet" `
-DFFMPEG_INCLUDE_DIR="$VcpkgInclude" ` -DFFMPEG_INCLUDE_DIR="$VcpkgInclude" `
-DFFMPEG_LIBAVCODEC="$VcpkgLib/avcodec.lib" ` -DFFMPEG_LIBAVCODEC="$VcpkgLib/avcodec.lib" `

5
.github/workflows/rpcs3.yml vendored
View file

@ -413,7 +413,7 @@ jobs:
arch: win64 arch: win64
env: env:
CCACHE_DIR: 'C:\ccache' CCACHE_DIR: 'C:\ccache'
VCPKG_TRIPLET: x64-windows-release VCPKG_TRIPLET: x64-windows
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@main uses: actions/checkout@main
@ -434,7 +434,7 @@ jobs:
path: | path: |
vcpkg/installed vcpkg/installed
vcpkg/buildtrees vcpkg/buildtrees
key: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-16248552313 key: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-test
restore-keys: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}- restore-keys: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-
- name: Install dependencies with vcpkg - name: Install dependencies with vcpkg
@ -447,6 +447,7 @@ jobs:
qtbase ` qtbase `
qtsvg ` qtsvg `
qtmultimedia ` qtmultimedia `
qttools `
zlib ` zlib `
vulkan ` vulkan `
libpng ` libpng `

25
rpcs3/CMakeLists.txt
View file

@ -156,26 +156,11 @@ if (NOT ANDROID)
add_custom_command(TARGET rpcs3 POST_BUILD add_custom_command(TARGET rpcs3 POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/test $<TARGET_FILE_DIR:rpcs3>/test) COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/test $<TARGET_FILE_DIR:rpcs3>/test
COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt
if(MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-quick-import
message(STATUS "Using clang-cl: copying Qt DLLs from vcpkg manually") --plugindir "$<TARGET_FILE_DIR:rpcs3>/qt6/plugins"
set(QT_DLLS Qt6Core.dll Qt6Gui.dll Qt6Widgets.dll Qt6Concurrent.dll Qt6Multimedia.dll Qt6MultimediaWidgets.dll Qt6Svg.dll Qt6SvgWidgets.dll) --verbose 0 "$<TARGET_FILE:rpcs3>")
foreach(dll IN LISTS QT_DLLS)
add_custom_command(TARGET rpcs3 POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${VCPKG_INSTALL_DIR}/bin/${dll}"
"$<TARGET_FILE_DIR:rpcs3>/${dll}")
endforeach()
else()
message(STATUS "Using windeployqt")
add_custom_command(TARGET rpcs3 POST_BUILD
COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt
--no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-quick-import
--plugindir "$<TARGET_FILE_DIR:rpcs3>/qt6/plugins"
--verbose 0 "$<TARGET_FILE:rpcs3>")
endif()
endif() endif()
# Unix installation # Unix installation