mirror of
https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git
synced 2025-07-06 04:55:12 +08:00
Merge pull request #330 from cgdae/master
Fix for OpenBSD - wordexp.h not available.
This commit is contained in:
commit
19a41d20ec
@ -1605,7 +1605,7 @@ class TinyGLTF {
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif !defined(__ANDROID__)
|
#elif !defined(__ANDROID__) && !defined(__OpenBSD__)
|
||||||
#include <wordexp.h>
|
#include <wordexp.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -2629,7 +2629,7 @@ std::string ExpandFilePath(const std::string &filepath, void *) {
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) || \
|
#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) || \
|
||||||
defined(__ANDROID__) || defined(__EMSCRIPTEN__)
|
defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__OpenBSD__)
|
||||||
// no expansion
|
// no expansion
|
||||||
std::string s = filepath;
|
std::string s = filepath;
|
||||||
#else
|
#else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user