diff options
| author | Ladislav Zezula <zezula@volny.cz> | 2020-03-21 08:33:35 +0100 |
|---|---|---|
| committer | Ladislav Zezula <zezula@volny.cz> | 2020-03-21 08:33:35 +0100 |
| commit | afaace949ce10be558f54fd1a059524ce12cc926 (patch) | |
| tree | 944f031acc763bec1c39ed5b5d3684b6934cc914 | |
| parent | a3228def1ee35d5836d380abac9f2efd5d35e67e (diff) | |
| parent | 847cc5a634e9ce9da87e5b638afbebd12b1039bf (diff) | |
Merge branch 'master' of https://github.com/ladislav-zezula/StormLib
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/StormPort.h | 4 |
2 files changed, 5 insertions, 1 deletions
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}") 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 |