3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[mhook] fix build error on windows (#10302)

Browse Source 
* Fix mhook build error.

* Removed the following entries from scripts/ci.baseline.txt: mhook:x64-windows=fail, mhook:x64-windows-static=fail, and mhook:x86-windows=fail.

* Removed unnecessary lines from fix-windows-packing-mismatch.patch.
This commit is contained in:
Ben Key 2020-03-10 19:25:50 -05:00 committed by GitHub
parent ffdfeef89c
commit 982713eca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/mhook/fix-windows-packing-mismatch.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e1df9f..e1e6ced 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(mhook)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake")
-add_definitions(-DNO_SANITY_CHECKS -DUNICODE -D_UNICODE -DWIN32_LEAN_AND_MEAN)
+add_definitions(-DNO_SANITY_CHECKS -DUNICODE -D_UNICODE -DWIN32_LEAN_AND_MEAN -DWINDOWS_IGNORE_PACKING_MISMATCH)
file(GLOB DisasmSrc disasm-lib/*.c disasm-lib/*.h)
file(GLOB MhookSrc mhook-lib/*.cpp mhook-lib/*.h)

1
ports/mhook/portfile.cmake
View File

@ -6,6 +6,7 @@ vcpkg_from_github(
REF 2.5.1
SHA512 914f198417b1e30301a42463af5cfbf9269dc64bcf1be87d3d6d2943fd72b3536f48eb4bfb25a51dd0bbe0f8f099777b2d49c9d58cb2e2eeb517d998917ae976
HEAD_REF master
PATCHES fix-windows-packing-mismatch.patch
)
vcpkg_configure_cmake(

3
scripts/ci.baseline.txt
View File

@ -1068,9 +1068,6 @@ mhook:arm-uwp=fail
mhook:x64-linux=fail
mhook:x64-osx=fail
mhook:x64-uwp=fail
mhook:x64-windows=fail
mhook:x64-windows-static=fail
mhook:x86-windows=fail
milerius-sfml-imgui:x64-osx=fail
milerius-sfml-imgui:x64-windows-static=fail
milerius-sfml-imgui:x64-linux=ignore