diff options
| author | Ben Key <BKey76@GMail.com> | 2020-03-10 19:25:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 17:25:50 -0700 |
| commit | 982713eca25a2e19f7867a37dcb89e1788a9d5c7 (patch) | |
| tree | cdbd7e1879fd168e7bde971b852d5362f3933ff6 | |
| parent | ffdfeef89ca9b84b91aa04db3a19aa8842643be3 (diff) | |
| download | vcpkg-982713eca25a2e19f7867a37dcb89e1788a9d5c7.tar.gz vcpkg-982713eca25a2e19f7867a37dcb89e1788a9d5c7.zip | |
[mhook] fix build error on windows (#10302)
* 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.
| -rw-r--r-- | ports/mhook/fix-windows-packing-mismatch.patch | 13 | ||||
| -rw-r--r-- | ports/mhook/portfile.cmake | 1 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ports/mhook/fix-windows-packing-mismatch.patch b/ports/mhook/fix-windows-packing-mismatch.patch new file mode 100644 index 000000000..847cd4ba3 --- /dev/null +++ b/ports/mhook/fix-windows-packing-mismatch.patch @@ -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) diff --git a/ports/mhook/portfile.cmake b/ports/mhook/portfile.cmake index e9faeccae..db42cc22b 100644 --- a/ports/mhook/portfile.cmake +++ b/ports/mhook/portfile.cmake @@ -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( diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 95184407d..adfb92959 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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
|