mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-12 17:16:44 +02:00
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
From: =?utf-8?q?Timo_R=C3=B6hling?= <timo.roehling@fkie.fraunhofer.de>
|
|
Date: Thu, 1 Oct 2020 16:46:48 +0200
|
|
Subject: Fix third party includes
|
|
|
|
Forwarded: not-needed
|
|
---
|
|
tests/tester.cc | 2 +-
|
|
tiny_gltf.h | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tests/tester.cc b/tests/tester.cc
|
|
index b06c30d..135f84e 100644
|
|
--- a/tests/tester.cc
|
|
+++ b/tests/tester.cc
|
|
@@ -4,7 +4,7 @@
|
|
#include "tiny_gltf.h"
|
|
|
|
// Nlohmann json(include ../json.hpp)
|
|
-#include "json.hpp"
|
|
+#include <nlohmann/json.hpp>
|
|
|
|
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
|
|
#include "catch.hpp"
|
|
diff --git a/tiny_gltf.h b/tiny_gltf.h
|
|
index 35a4d00..922b8b6 100644
|
|
--- a/tiny_gltf.h
|
|
+++ b/tiny_gltf.h
|
|
@@ -1722,7 +1722,7 @@ class TinyGLTF {
|
|
|
|
#ifndef TINYGLTF_NO_INCLUDE_JSON
|
|
#ifndef TINYGLTF_USE_RAPIDJSON
|
|
-#include "json.hpp"
|
|
+#include <nlohmann/json.hpp>
|
|
#else
|
|
#ifndef TINYGLTF_NO_INCLUDE_RAPIDJSON
|
|
#include "document.h"
|
|
@@ -1741,13 +1741,13 @@ class TinyGLTF {
|
|
|
|
#ifndef TINYGLTF_NO_STB_IMAGE
|
|
#ifndef TINYGLTF_NO_INCLUDE_STB_IMAGE
|
|
-#include "stb_image.h"
|
|
+#include <stb_image.h>
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
|
|
#ifndef TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE
|
|
-#include "stb_image_write.h"
|
|
+#include <stb_image_write.h>
|
|
#endif
|
|
#endif
|
|
|