PCSX2/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-10-12 02:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Use correct deps path when building for WoA

Browse Source
This commit is contained in:
TheLastRar
2026-09-19 13:07:54 -04:00
committed by Ty
parent bc03b94ff0
commit f4241277d2
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2/CMakeLists.txt
+10 -3
View File
@@ -1311,7 +1311,11 @@ function(setup_main_executable target)
endif()
# Copy dependency libraries.
set(DEPS_BINDIR "${CMAKE_SOURCE_DIR}/deps/bin")
if(ARCH_ARM64)
set(DEPS_BINDIR "${CMAKE_SOURCE_DIR}/deps-arm64/bin")
else()
set(DEPS_BINDIR "${CMAKE_SOURCE_DIR}/deps/bin")
endif()
set(DEPS_TO_COPY freetype.dll harfbuzz.dll jpeg62.dll libpng16.dll libsharpyuv.dll libwebp.dll libwebpdemux.dll libwebpmux.dll lz4.dll SDL3.dll shaderc_shared.dll z.dll zstd.dll plutovg.dll plutosvg.dll ryml.dll dxcompiler.dll)
set(DEPS_TO_COPY
$<IF:$<CONFIG:Debug>,kddockwidgets-qt6d.dll,kddockwidgets-qt6.dll>
@@ -1339,14 +1343,17 @@ function(setup_main_executable target)
install(FILES "${DEPS_BINDIR}/${SYMBOL_TO_COPY}" DESTINATION "${CMAKE_SOURCE_DIR}/bin" OPTIONAL)
endforeach()
set(AGILITY_DIR "${CMAKE_SOURCE_DIR}/deps/bin/D3D12")
set(AGILITY_DEPS_TO_COPY D3D12Core.dll d3d12SDKLayers.dll)
foreach(AGILITY_DEP_TO_COPY ${AGILITY_DEPS_TO_COPY})
install(FILES "${DEPS_BINDIR}/D3D12/${AGILITY_DEP_TO_COPY}" DESTINATION "${CMAKE_SOURCE_DIR}/bin/D3D12" OPTIONAL)
endforeach()
get_target_property(WINDEPLOYQT_EXE Qt6::windeployqt IMPORTED_LOCATION)
install(CODE "execute_process(COMMAND \"${WINDEPLOYQT_EXE}\" \"${CMAKE_SOURCE_DIR}/bin/$<TARGET_FILE_NAME:${target}>\" --plugindir \"${CMAKE_SOURCE_DIR}/bin/QtPlugins\" --pdb --no-compiler-runtime --no-system-d3d-compiler --no-system-dxc-compiler --no-translations --no-network COMMAND_ERROR_IS_FATAL ANY)")
set(DEPS_QT_PATH)
if (ARCH_ARM64)
set(DEPS_QT_PATH "--qtpaths \"${DEPS_BINDIR}/qtpaths.bat\"")
endif()
install(CODE "execute_process(COMMAND \"${WINDEPLOYQT_EXE}\" \"${CMAKE_SOURCE_DIR}/bin/$<TARGET_FILE_NAME:${target}>\" --plugindir \"${CMAKE_SOURCE_DIR}/bin/QtPlugins\" ${DEPS_QT_PATH} --pdb --no-compiler-runtime --no-system-d3d-compiler --no-system-dxc-compiler --no-translations --no-network COMMAND_ERROR_IS_FATAL ANY)")
install(CODE "file(WRITE \"${CMAKE_SOURCE_DIR}/bin/qt.conf\" \"[Paths]\\nPlugins = ./QtPlugins\")")
endif()