v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

pull/972/head
Alexandr Arutjunov 2016-09-20 16:06:08 +03:00
parent f11545d2c0 dad4d0fa99
commit 0bc410a562
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/Open3DGC/o3dgcTimer.h
View File

@ -27,6 +27,8 @@ THE SOFTWARE.
#include "o3dgcCommon.h" #include "o3dgcCommon.h"
#ifdef WIN32 #ifdef WIN32
/* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */
#define NOMINMAX
#include <windows.h> #include <windows.h>
#elif __MACH__ #elif __MACH__
#include <mach/clock.h> #include <mach/clock.h>