msvc: copy openssl dlls (#6428)
This commit is contained in:
parent
3dd6557332
commit
c9b2bd9077
|
@ -12,7 +12,8 @@ cmake .. \
|
||||||
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
|
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
|
||||||
-DUSE_DISCORD_PRESENCE=ON \
|
-DUSE_DISCORD_PRESENCE=ON \
|
||||||
-DENABLE_MF=ON \
|
-DENABLE_MF=ON \
|
||||||
-DENABLE_FFMPEG_VIDEO_DUMPER=ON
|
-DENABLE_FFMPEG_VIDEO_DUMPER=ON \
|
||||||
|
-DOPENSSL_DLL_DIR="C:\Program Files\OpenSSL\bin"
|
||||||
|
|
||||||
ninja
|
ninja
|
||||||
# show the caching efficiency
|
# show the caching efficiency
|
||||||
|
|
|
@ -28,6 +28,9 @@ option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
|
||||||
CMAKE_DEPENDENT_OPTION(CITRA_USE_BUNDLED_QT "Download bundled Qt binaries" ON "ENABLE_QT;MSVC" OFF)
|
CMAKE_DEPENDENT_OPTION(CITRA_USE_BUNDLED_QT "Download bundled Qt binaries" ON "ENABLE_QT;MSVC" OFF)
|
||||||
|
|
||||||
option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
|
option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
|
||||||
|
if (MSVC)
|
||||||
|
set(OPENSSL_DLL_DIR "" CACHE PATH "Location of the Openssl dlls")
|
||||||
|
endif()
|
||||||
|
|
||||||
option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
|
option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
function(copy_citra_openssl_deps target_dir)
|
||||||
|
include(WindowsCopyFiles)
|
||||||
|
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
|
||||||
|
windows_copy_files(${target_dir} ${OPENSSL_DLL_DIR} ${DLL_DEST} libcrypto-1_1-x64.dll)
|
||||||
|
windows_copy_files(${target_dir} ${OPENSSL_DLL_DIR} ${DLL_DEST} libssl-1_1-x64.dll)
|
||||||
|
endfunction(copy_citra_openssl_deps)
|
|
@ -34,6 +34,10 @@ endif()
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
include(CopyCitraSDLDeps)
|
include(CopyCitraSDLDeps)
|
||||||
copy_citra_SDL_deps(citra)
|
copy_citra_SDL_deps(citra)
|
||||||
|
if (ENABLE_WEB_SERVICE AND OPENSSL_DLL_DIR)
|
||||||
|
include(CopyCitraOpensslDeps)
|
||||||
|
copy_citra_openssl_deps(citra)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (CITRA_USE_PRECOMPILED_HEADERS)
|
if (CITRA_USE_PRECOMPILED_HEADERS)
|
||||||
|
|
|
@ -322,6 +322,10 @@ if (MSVC)
|
||||||
include(CopyCitraSDLDeps)
|
include(CopyCitraSDLDeps)
|
||||||
copy_citra_Qt5_deps(citra-qt)
|
copy_citra_Qt5_deps(citra-qt)
|
||||||
copy_citra_SDL_deps(citra-qt)
|
copy_citra_SDL_deps(citra-qt)
|
||||||
|
if (ENABLE_WEB_SERVICE AND OPENSSL_DLL_DIR)
|
||||||
|
include(CopyCitraOpensslDeps)
|
||||||
|
copy_citra_openssl_deps(citra-qt)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (ENABLE_FFMPEG)
|
if (ENABLE_FFMPEG)
|
||||||
include(CopyCitraFFmpegDeps)
|
include(CopyCitraFFmpegDeps)
|
||||||
|
|
|
@ -12,6 +12,10 @@ target_link_libraries(citra-room PRIVATE common network)
|
||||||
if (ENABLE_WEB_SERVICE)
|
if (ENABLE_WEB_SERVICE)
|
||||||
target_compile_definitions(citra-room PRIVATE -DENABLE_WEB_SERVICE)
|
target_compile_definitions(citra-room PRIVATE -DENABLE_WEB_SERVICE)
|
||||||
target_link_libraries(citra-room PRIVATE web_service)
|
target_link_libraries(citra-room PRIVATE web_service)
|
||||||
|
if (MSVC AND OPENSSL_DLL_DIR)
|
||||||
|
include(CopyCitraOpensslDeps)
|
||||||
|
copy_citra_openssl_deps(citra-room)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(citra-room PRIVATE cryptopp)
|
target_link_libraries(citra-room PRIVATE cryptopp)
|
||||||
|
|
Reference in New Issue