Merge branch 'gltf_o3dgc' of https://github.com/smalcom/assimp into gltf_o3dgc

2016-09-20 16:06:08 +03:00 · 2016-09-20 16:06:08 +03:00 · 0bc410a562
parent f11545d2c0 dad4d0fa99
commit 0bc410a562
1 changed files with 2 additions and 0 deletions
--- a/contrib/Open3DGC/o3dgcTimer.h
+++ b/contrib/Open3DGC/o3dgcTimer.h
@ -27,6 +27,8 @@ THE SOFTWARE.
 #include "o3dgcCommon.h"

 #ifdef WIN32
+/* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */
+#define NOMINMAX
 #include <windows.h>
 #elif __MACH__
 #include <mach/clock.h>