diff options
| author | Davide Beatrici <git@davidebeatrici.dev> | 2020-07-25 04:43:33 +0300 |
|---|---|---|
| committer | Davide Beatrici <git@davidebeatrici.dev> | 2020-07-25 04:43:33 +0300 |
| commit | ca54653e434ece5b33583890934e9672b42428a9 (patch) | |
| tree | cbee32f84ea814141109454c01b694464ea744ab /overlay | |
| parent | 582239319b2b40482fbb690589213e62fd55a329 (diff) | |
FIX(overlay): only use minhook for 64 bit overlay library
We are working on adding a 32 bit Windows build to Azure Pipelines and noticed that it was failing due to "IUnknown" not being defined.
The issue was quickly fixed by including <unknwn.h>, however we wondered why we didn't encounter it with the 64 bit Windows build (which compiles the overlay library as 64 bit and 32 bit).
Turns out minhook was used for the 32 bit overlay library due to the if() logic missing a crucial condition: "BUILD_OVERLAY_XCOMPILE" must be false, because "64_BIT" is true due to it being defined outside of the cross-compile environment.
Diffstat (limited to 'overlay')
| -rw-r--r-- | overlay/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt index b1db2061b..0ab2168be 100644 --- a/overlay/CMakeLists.txt +++ b/overlay/CMakeLists.txt @@ -131,7 +131,7 @@ else() install(TARGETS overlay RUNTIME DESTINATION . COMPONENT mumble_client) endif() -if(64_BIT) +if(64_BIT AND NOT BUILD_OVERLAY_XCOMPILE) add_subdirectory("${3RDPARTY_DIR}/minhook-src" "${CMAKE_CURRENT_BINARY_DIR}/minhook" EXCLUDE_FROM_ALL) target_compile_definitions(overlay PRIVATE "USE_MINHOOK") target_link_libraries(overlay PRIVATE minhook) |