Resolve _WIN32 isnan() fiasco completely.

This commit is contained in:
Pär Winzell 2018-05-27 13:28:49 -07:00
parent d3f9a269ba
commit 7995f7b341
2 changed files with 6 additions and 2 deletions

View File

@ -11,8 +11,6 @@
#define __FBX2GLTF_H__
#if defined ( _WIN32 )
// This can be a macro under Windows, confusing FMT
#undef isnan
// Tell Windows not to define min() and max() macros
#define NOMINMAX
#include <Windows.h>
@ -23,6 +21,11 @@ const std::string FBX2GLTF_VERSION = "0.9.5";
#include <fmt/printf.h>
#include <fbxsdk.h>
#if defined ( _WIN32 )
// this is defined in fbxmath.h
#undef isnan
#endif
#include "mathfu.h"
#endif // !__FBX2GLTF_H__

View File

@ -17,6 +17,7 @@
#include <cstdint>
#include <cstdio>
#include <cassert>
#include <cmath>
#include "FBX2glTF.h"
#include "utils/File_Utils.h"