GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-16 14:16:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Patch to fix previous commit for MinGW.

Browse Source
This commit is contained in:
imallett 2022-10-07 11:20:39 -07:00
parent d9ce9eb9d2
commit 3a295887d6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tiny_gltf.h
View File

@ -1599,7 +1599,7 @@ class TinyGLTF {
// issue 143. // issue 143.
// Define NOMINMAX to avoid min/max defines, // Define NOMINMAX to avoid min/max defines,
// but undef it after included windows.h // but undef it after included Windows.h
#ifndef NOMINMAX #ifndef NOMINMAX
#define TINYGLTF_INTERNAL_NOMINMAX #define TINYGLTF_INTERNAL_NOMINMAX
#define NOMINMAX #define NOMINMAX
@ -1609,7 +1609,11 @@ class TinyGLTF {
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define TINYGLTF_INTERNAL_WIN32_LEAN_AND_MEAN #define TINYGLTF_INTERNAL_WIN32_LEAN_AND_MEAN
#endif #endif
#ifndef __MINGW32__
#include <Windows.h> // include API for expanding a file path #include <Windows.h> // include API for expanding a file path
#else
#include <windows.h>
#endif
#ifdef TINYGLTF_INTERNAL_WIN32_LEAN_AND_MEAN #ifdef TINYGLTF_INTERNAL_WIN32_LEAN_AND_MEAN
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN