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

Fix for when json and stb is aready used in project v2

Browse Source
This commit is contained in:
kroko 2019-03-03 01:28:45 +02:00
parent f4b6d11abc
commit 6a0d4c57b1
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tiny_gltf.h
View File

@ -1087,20 +1087,16 @@ class TinyGLTF {
#endif #endif
#ifndef TINYGLTF_NO_STB_IMAGE #ifndef TINYGLTF_NO_STB_IMAGE
#ifndef STB_IMAGE_IMPLEMENTATION
#ifndef TINYGLTF_BYPASS_INCLUDE_STB_IMAGE #ifndef TINYGLTF_BYPASS_INCLUDE_STB_IMAGE
#include "stb_image.h" #include "stb_image.h"
#endif #endif
#endif #endif
#endif
#ifndef TINYGLTF_NO_STB_IMAGE_WRITE #ifndef TINYGLTF_NO_STB_IMAGE_WRITE
#ifndef STB_IMAGE_WRITE_IMPLEMENTATION
#ifndef TINYGLTF_BYPASS_INCLUDE_STB_IMAGE #ifndef TINYGLTF_BYPASS_INCLUDE_STB_IMAGE
#include "stb_image_write.h" #include "stb_image_write.h"
#endif #endif
#endif #endif
#endif
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop