Merge pull request #63 from lioncash/windows

CMakeLists: Define -DNOMINMAX and -DWIN32_LEAN_AND_MEAN on Windows
2019-09-08 00:12:59 -07:00 · 2019-09-08 00:12:59 -07:00 · 925fee31c8
parent 30158859f7 b7974ffd01
commit 925fee31c8
3 changed files with 5 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -74,6 +74,11 @@ if(WIN32)
        src/athena/FileWriterWin32.cpp
        src/athena/FileReaderWin32.cpp
    )
+
+    target_compile_definitions(athena-core PRIVATE
+        -DNOMINMAX
+        -DWIN32_LEAN_AND_MEAN
+    )
 else()
    target_sources(athena-core PRIVATE
        src/athena/FileWriterNix.cpp
--- a/src/athena/FileWriterWin32.cpp
+++ b/src/athena/FileWriterWin32.cpp
@ -3,9 +3,6 @@
 #include <algorithm>
 #include <limits>

-#undef min
-#undef max
-
 namespace athena::io {
 FileWriter::FileWriter(std::string_view filename, bool overwrite, bool globalErr)
 : m_fileHandle(0), m_globalErr(globalErr) {
--- a/src/athena/MemoryReader.cpp
+++ b/src/athena/MemoryReader.cpp
@ -8,9 +8,6 @@
 #include <malloc.h>
 #endif // HW_RVL

-#undef min
-#undef max
-
 namespace athena::io {
 MemoryReader::MemoryReader(const void* data, atUint64 length, bool takeOwnership, bool globalErr)
 : m_data(data), m_length(length), m_position(0), m_owns(takeOwnership), m_globalErr(globalErr) {