diff options
| author | Jan <sentrycraft123@gmail.com> | 2023-07-22 02:22:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-22 02:22:26 +0200 |
| commit | d3fb76f889101f024f410c194a66f0f4a2f6c4a0 (patch) | |
| tree | 9739770458ee74e28474949b8e5e310c20f4734a /loader_wsock32_proxy | |
| parent | 9841d698f89e1ec6cc9b0c04df10bad6010a54fe (diff) | |
| download | NorthstarLauncher-d3fb76f889101f024f410c194a66f0f4a2f6c4a0.tar.gz NorthstarLauncher-d3fb76f889101f024f410c194a66f0f4a2f6c4a0.zip | |
Replace vendored libcurl and minhook with submodules (#500)v1.17.1-rc1
* Replace vendored libcurl and minhook with submodules
* Add cmake utility for checking submodules and initializing them
* Update build instructions to use Git
Diffstat (limited to 'loader_wsock32_proxy')
| -rw-r--r-- | loader_wsock32_proxy/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | loader_wsock32_proxy/pch.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/loader_wsock32_proxy/CMakeLists.txt b/loader_wsock32_proxy/CMakeLists.txt index 81d0b04c..3c21d010 100644 --- a/loader_wsock32_proxy/CMakeLists.txt +++ b/loader_wsock32_proxy/CMakeLists.txt @@ -1,5 +1,7 @@ # loader_wsock32_proxy +find_package(minhook REQUIRED) + add_library(loader_wsock32_proxy SHARED "dllmain.cpp" "loader.cpp" @@ -11,7 +13,7 @@ add_library(loader_wsock32_proxy SHARED ) target_link_libraries(loader_wsock32_proxy PRIVATE - ${CMAKE_SOURCE_DIR}/thirdparty/minhook/MinHook.x64.lib + minhook mswsock.lib ws2_32.lib ShLwApi.lib @@ -31,10 +33,6 @@ target_link_libraries(loader_wsock32_proxy PRIVATE odbccp32.lib ) -target_include_directories(loader_wsock32_proxy PRIVATE - ${CMAKE_SOURCE_DIR}/thirdparty -) - target_precompile_headers(loader_wsock32_proxy PRIVATE pch.h) target_compile_definitions(loader_wsock32_proxy PRIVATE diff --git a/loader_wsock32_proxy/pch.h b/loader_wsock32_proxy/pch.h index 5da029a3..ebc29547 100644 --- a/loader_wsock32_proxy/pch.h +++ b/loader_wsock32_proxy/pch.h @@ -11,6 +11,6 @@ // Windows Header Files #include <windows.h> -#include "minhook/MinHook.h" +#include "MinHook.h" #endif // PCH_H |