build: fix openssl pre-build path. (#3205)

lang: fix typo of audio settings.
This commit is contained in:
Zangetsu 2024-02-04 10:40:36 +01:00 committed by GitHub
parent b5aa1ec5dd
commit ed9a01a2f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions

View file

@ -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)

View file

@ -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()

View file

@ -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"));