| 1 | From: =?utf-8?q?Timo_R=C3=B6hling?= <[email protected]>
|
| 2 | Date: Thu, 1 Oct 2020 16:46:48 +0200
|
| 3 | Subject: Fix third party includes
|
| 4 |
|
| 5 | Forwarded: not-needed
|
| 6 | ---
|
| 7 | tests/tester.cc | 2 +-
|
| 8 | tiny_gltf.h | 6 +++---
|
| 9 | 2 files changed, 4 insertions(+), 4 deletions(-)
|
| 10 |
|
| 11 | diff --git a/tests/tester.cc b/tests/tester.cc
|
| 12 | index b06c30d..135f84e 100644
|
| 13 | |
| 14 | |
| 15 | @@ -4,7 +4,7 @@
|
| 16 | #include "tiny_gltf.h"
|
| 17 |
|
| 18 | // Nlohmann json(include ../json.hpp)
|
| 19 | -#include "json.hpp"
|
| 20 | +#include <nlohmann/json.hpp>
|
| 21 |
|
| 22 | #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
|
| 23 | #include "catch.hpp"
|
| 24 | diff --git a/tiny_gltf.h b/tiny_gltf.h
|
| 25 | index 35a4d00..922b8b6 100644
|
| 26 | |
| 27 | |
| 28 | @@ -1722,7 +1722,7 @@ class TinyGLTF {
|
| 29 |
|
| 30 | #ifndef TINYGLTF_NO_INCLUDE_JSON
|
| 31 | #ifndef TINYGLTF_USE_RAPIDJSON
|
| 32 | -#include "json.hpp"
|
| 33 | +#include <nlohmann/json.hpp>
|
| 34 | #else
|
| 35 | #ifndef TINYGLTF_NO_INCLUDE_RAPIDJSON
|
| 36 | #include "document.h"
|
| 37 | @@ -1741,13 +1741,13 @@ class TinyGLTF {
|
| 38 |
|
| 39 | #ifndef TINYGLTF_NO_STB_IMAGE
|
| 40 | #ifndef TINYGLTF_NO_INCLUDE_STB_IMAGE
|
| 41 | -#include "stb_image.h"
|
| 42 | +#include <stb_image.h>
|
| 43 | #endif
|
| 44 | #endif
|
| 45 |
|
| 46 | #ifndef TINYGLTF_NO_STB_IMAGE_WRITE
|
| 47 | #ifndef TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE
|
| 48 | -#include "stb_image_write.h"
|
| 49 | +#include <stb_image_write.h>
|
| 50 | #endif
|
| 51 | #endif
|
| 52 |
|