From d3fb76f889101f024f410c194a66f0f4a2f6c4a0 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 22 Jul 2023 02:22:26 +0200 Subject: Replace vendored libcurl and minhook with submodules (#500) * Replace vendored libcurl and minhook with submodules * Add cmake utility for checking submodules and initializing them * Update build instructions to use Git --- NorthstarDLL/CMakeLists.txt | 7 +++++-- NorthstarDLL/pch.h | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'NorthstarDLL') diff --git a/NorthstarDLL/CMakeLists.txt b/NorthstarDLL/CMakeLists.txt index 11c4eb14..f6ff8014 100644 --- a/NorthstarDLL/CMakeLists.txt +++ b/NorthstarDLL/CMakeLists.txt @@ -1,5 +1,8 @@ # NorthstarDLL +find_package(minhook REQUIRED) +find_package(libcurl REQUIRED) + add_library(NorthstarDLL SHARED "client/audio.cpp" "client/audio.h" @@ -146,8 +149,8 @@ add_library(NorthstarDLL SHARED ) target_link_libraries(NorthstarDLL PRIVATE - ${CMAKE_SOURCE_DIR}/thirdparty/minhook/MinHook.x64.lib - ${CMAKE_SOURCE_DIR}/thirdparty/libcurl/lib/libcurl_a.lib + minhook + libcurl WS2_32.lib Crypt32.lib Cryptui.lib diff --git a/NorthstarDLL/pch.h b/NorthstarDLL/pch.h index e4773d8a..b9ba0e08 100644 --- a/NorthstarDLL/pch.h +++ b/NorthstarDLL/pch.h @@ -36,8 +36,8 @@ typedef void (*callable_v)(void* v); #include "spdlog/spdlog.h" #include "logging/logging.h" -#include "minhook/MinHook.h" -#include "libcurl/include/curl/curl.h" +#include "MinHook.h" +#include "curl/curl.h" #include "core/hooks.h" #include "core/memory.h" -- cgit v1.2.3