package An official xmake package repository
https://xrepo.xmake.io/
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.0 KiB
48 lines
1.0 KiB
3 years ago
|
diff --git a/include/UtilFoundation.h b/include/UtilFoundation.h
|
||
|
|
index 2eb6290..a449b5b 100644
|
||
|
|
--- a/include/UtilFoundation.h
|
||
|
|
+++ b/include/UtilFoundation.h
|
||
|
|
@@ -70,3 +70,3 @@
|
||
|
|
|
||
|
|
-#include <half.h>
|
||
|
|
+#include <OpenEXR/half.h>
|
||
|
|
|
||
|
|
@@ -90,6 +90,9 @@
|
||
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
||
|
|
#define WIN32_LEAN_AND_MEAN
|
||
|
|
#endif
|
||
|
|
+#ifndef NOMINMAX
|
||
|
|
+#define NOMINMAX
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
// needed for mutex stuff
|
||
|
|
#include <Windows.h>
|
||
|
|
diff --git a/src/FieldMapping.cpp b/src/FieldMapping.cpp
|
||
|
|
index b1f1a1f..90612b1 100644
|
||
|
|
--- a/src/FieldMapping.cpp
|
||
|
|
+++ b/src/FieldMapping.cpp
|
||
|
|
@@ -49,9 +49,6 @@
|
||
|
|
#include "FieldMapping.h"
|
||
|
|
#include "Types.h"
|
||
|
|
|
||
|
|
-#ifdef WIN32
|
||
|
|
-#define isnan(__x__) _isnan(__x__)
|
||
|
|
-#endif
|
||
|
|
|
||
|
|
//----------------------------------------------------------------------------//
|
||
|
|
|
||
|
|
diff --git a/src/Log.cpp b/src/Log.cpp
|
||
|
|
index f78229c..d095a50 100644
|
||
|
|
--- a/src/Log.cpp
|
||
|
|
+++ b/src/Log.cpp
|
||
|
|
@@ -40,7 +40,8 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
//----------------------------------------------------------------------------//
|
||
|
|
-
|
||
|
|
+#ifndef _WIN32
|
||
|
|
#include <unistd.h>
|
||
|
|
+#endif
|
||
|
|
#include <ios>
|
||
|
|
#include <fstream>
|