From 27f1e63c98852df8cec377f837446eab48ab1d7f Mon Sep 17 00:00:00 2001 From: HappyTanuki Date: Tue, 27 May 2025 14:00:17 +0900 Subject: [PATCH] =?UTF-8?q?openssl=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 13 +++++++++++++ Client/CMakeLists.txt | 3 +++ Client/src/main.cpp | 2 -- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88f4c4e..4d2c560 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,5 +10,18 @@ endif() project(${PROJECT_NAME}) +if(WIN32) + set(OPENSSL_ROOT_DIR "C:/Program Files/OpenSSL-Win64") + set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include") + + if(CMAKE_BUILD_TYPE STREQUAL Debug) + set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_ROOT_DIR}/lib/VC/x64/MTd/libcrypto.lib") + set(OPENSSL_SSL_LIBRARY "${OPENSSL_ROOT_DIR}/lib/VC/x64/MTd/libssl.lib") + else() + set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_ROOT_DIR}/lib/VC/x64/MT/libcrypto.lib") + set(OPENSSL_SSL_LIBRARY "${OPENSSL_ROOT_DIR}/lib/VC/x64/MT/libssl.lib") + endif() +endif() + add_subdirectory(Client) # add_subdirectory(Server) \ No newline at end of file diff --git a/Client/CMakeLists.txt b/Client/CMakeLists.txt index 6bd6807..ea574ef 100644 --- a/Client/CMakeLists.txt +++ b/Client/CMakeLists.txt @@ -3,6 +3,7 @@ set(PROJECT_NAME "Client") project(${PROJECT_NAME}) find_package(Vulkan REQUIRED) +find_package(OpenSSL REQUIRED) include(Shaders.cmake) include(FetchContent) @@ -58,6 +59,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE glfw) target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft.GSL::GSL) target_link_libraries(${PROJECT_NAME} PRIVATE spdlog) target_link_libraries(${PROJECT_NAME} PRIVATE assimp::assimp) +target_link_libraries(${PROJECT_NAME} PRIVATE OpenSSL::Crypto) +target_link_libraries(${PROJECT_NAME} PRIVATE OpenSSL::SSL) target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include") target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20) diff --git a/Client/src/main.cpp b/Client/src/main.cpp index 7411e58..634eaa1 100644 --- a/Client/src/main.cpp +++ b/Client/src/main.cpp @@ -4,7 +4,6 @@ #include #include -#include "asset/loader.h" #include "glfw/glfw_initialization.h" #include "glfw/glfw_monitor.h" #include "glfw/glfw_window.h" @@ -12,7 +11,6 @@ #include "vulkan/coordinate.h" #include "vulkan/engine.h" #include "vulkan/graphics.h" -#include "vulkan/physics.h" void BeginPlay(veng::Engine& engine) { veng::Model* const player = engine.SpawnModel("player", "player");