From a89706df030981817e98f737a22dad3053141a82 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 30 Oct 2019 00:19:16 +0000
Subject: StormPort: Suppress `min/max` macros from windows

This makes StormLib usable with C++ stdlib (e.g. the <algorithm> header which defines std::min/max)
---
 src/StormPort.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/StormPort.h b/src/StormPort.h
index c52e9ff..349dd20 100644
--- a/src/StormPort.h
+++ b/src/StormPort.h
@@ -48,7 +48,11 @@
   #include <assert.h>
   #include <ctype.h>
   #include <stdio.h>
+
+  // Suppress definitions of `min` and `max` macros by <windows.h>:
+  #define NOMINMAX 1
   #include <windows.h>
+
   #include <wininet.h>
   #define PLATFORM_LITTLE_ENDIAN
 
-- 
cgit v1.2.3


From 4aa2446d784ff3d0d3c5af4d0e278b6b47596665 Mon Sep 17 00:00:00 2001
From: Simon Mossmyr <simon.mossmyr@sunstone.se>
Date: Fri, 1 Nov 2019 22:31:28 +0100
Subject: Fix incorrect CPack description file path

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d283a3..fed5e0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -341,7 +341,7 @@ install(TARGETS ${LIBRARY_NAME}
     SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
     SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPQ manipulation library")
     SET(CPACK_PACKAGE_VENDOR "Ladislav Zezula")
-    SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+    SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
     SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
     SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
     SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
-- 
cgit v1.2.3