4 files changed, 50 insertions, 12 deletions
diff --git a/ports/mmloader/CONTROL b/ports/mmloader/CONTROL
deleted file mode 100644
index e57556062..000000000
--- a/ports/mmloader/CONTROL
+++ /dev/null
@@ -1,8 +0,0 @@
-Source: mmloader
-Version: 2020-05-15
-Description: A library for loading dll module bypassing windows PE loader from memory (x86/x64)
-Homepage: http://tishion.github.io/mmLoader/
-Supports: (x86|x64)&windows&static
-
-Feature: shellcode
-Description: Generate mmLoader shell code headers
diff --git a/ports/mmloader/fix_c_and_cxx_flags.patch b/ports/mmloader/fix_c_and_cxx_flags.patch
new file mode 100644
index 000000000..501ce40cd
--- /dev/null
+++ b/ports/mmloader/fix_c_and_cxx_flags.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a22b56..2ce1bd8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,24 +47,11 @@ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CONFIGURATION_TYPES Debug Release)
+ 
+ # Default compile flags
+-set(CMAKE_CXX_FLAGS 
+-    "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG"
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS-"
+     CACHE STRING "default C++ compile flags" FORCE)
+-set(CMAKE_CXX_FLAGS_DEBUG 
+-    "/MTd /Ob0 /Od" 
+-    CACHE STRING "default C++ compile flags for debug build" FORCE)
+-set(CMAKE_CXX_FLAGS_RELEASE 
+-    "/MT /O2 /Ob2 /DNDEBUG" 
+-    CACHE STRING "default C++ compile flags for release build" FORCE)
+-set(CMAKE_C_FLAGS 
+-    "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG"
++set(CMAKE_C_FLAGS
++    "${CMAKE_C_FLAGS} /GS-"
+     CACHE STRING "default C++ compile flags" FORCE)
+-set(CMAKE_C_FLAGS_DEBUG
+-    "/MTd /Ob0 /Od" 
+-    CACHE STRING "default C++ compile flags for debug build" FORCE)
+-set(CMAKE_C_FLAGS_RELEASE 
+-    "/MT /O2 /Ob2 /DNDEBUG" 
+-    CACHE STRING "default C++ compile flags for release build" FORCE)
+ 
+ message(STATUS "CMAKE_CXX_FLAGS=" ${CMAKE_CXX_FLAGS})
+ message(STATUS "CMAKE_CXX_FLAGS_DEBUG=" ${CMAKE_CXX_FLAGS_DEBUG})
diff --git a/ports/mmloader/portfile.cmake b/ports/mmloader/portfile.cmake
index 2a3411ce3..c1f168446 100644
--- a/ports/mmloader/portfile.cmake
+++ b/ports/mmloader/portfile.cmake
@@ -1,4 +1,3 @@
-
 # fail early for unsupported triplets
 vcpkg_fail_port_install(
     MESSAGE "mmLoader supports only x86/x64-windows-static triplets"
@@ -15,6 +14,8 @@ vcpkg_from_github(
     REF 1.0.0
     SHA512 ceb2ab4b60d74209fa46d198cde6fd87a97d911abb875ac35383288a67828d0420bb38ff8d2f17dd4a3f46ba3abf554152d1246eeb05215258e8af64ac4a39de
     HEAD_REF master
+    PATCHES
+        fix_c_and_cxx_flags.patch
 )
 
 # feature
@@ -30,13 +31,13 @@ vcpkg_configure_cmake(
 )
 
 # pre-clean
-file(REMOVE_RECURSE ${SOURCE_PATH}/output)
+file(REMOVE_RECURSE "${SOURCE_PATH}/output")
 
 # build and install
 vcpkg_install_cmake(DISABLE_PARALLEL)
 
 # remove the debug/include directory
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # collect license files
-file(INSTALL ${SOURCE_PATH}/License DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/mmloader/vcpkg.json b/ports/mmloader/vcpkg.json
new file mode 100644
index 000000000..a48ecb38b
--- /dev/null
+++ b/ports/mmloader/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "mmloader",
+  "version-string": "2020-05-15",
+  "port-version": 1,
+  "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)",
+  "homepage": "http://tishion.github.io/mmLoader/",
+  "supports": "(x86 | x64) & windows & static",
+  "features": {
+    "shellcode": {
+      "description": "Generate mmLoader shell code headers"
+    }
+  }
+}