mirror of
https://github.com/Vita3K/Vita3K.git
synced 2024-05-31 19:17:49 -04:00
build: fix openssl pre-build path. (#3205)
lang: fix typo of audio settings.
This commit is contained in:
parent
b5aa1ec5dd
commit
ed9a01a2f9
2
external/CMakeLists.txt
vendored
2
external/CMakeLists.txt
vendored
|
@ -280,7 +280,7 @@ if(NOT OPENSSL_FOUND)
|
|||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external/openssl")
|
||||
endif()
|
||||
|
||||
set(OPENSSL_ROOT_DIR "${CMAKE_BINARY_DIR}/external/openssl/openssl-3/x64")
|
||||
set(OPENSSL_ROOT_DIR "${CMAKE_BINARY_DIR}/external/openssl/openssl-3.1/x64")
|
||||
endif()
|
||||
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
|
|
@ -274,8 +274,8 @@ elseif(WIN32)
|
|||
add_custom_command(
|
||||
TARGET vita3k
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/external/openssl/openssl-3/x64/bin/libssl-3-x64.dll" "$<TARGET_FILE_DIR:vita3k>"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/external/openssl/openssl-3/x64/bin/libcrypto-3-x64.dll" "$<TARGET_FILE_DIR:vita3k>")
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/external/openssl/openssl-3.1/x64/bin/libssl-3-x64.dll" "$<TARGET_FILE_DIR:vita3k>"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/external/openssl/openssl-3.1/x64/bin/libcrypto-3-x64.dll" "$<TARGET_FILE_DIR:vita3k>")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
@ -378,7 +378,7 @@ void init_lang(LangState &lang, EmuEnvState &emuenv) {
|
|||
set_lang_string(lang.settings_dialog.gpu, settings_dialog.child("gpu"));
|
||||
|
||||
// Audio
|
||||
set_lang_string(lang.settings_dialog.emulator, settings_dialog.child("audio"));
|
||||
set_lang_string(lang.settings_dialog.audio, settings_dialog.child("audio"));
|
||||
|
||||
// System
|
||||
set_lang_string(lang.settings_dialog.system, settings_dialog.child("system"));
|
||||
|
|
Loading…
Reference in a new issue