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

Merge pull request #21 from thestr4ng3r/devel

Browse Source 
Disable wordexp for Android
This commit is contained in:
Syoyo Fujita 2017-09-23 00:07:20 +09:00 committed by GitHub
commit dfe8c70d9a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tiny_gltf.h
View File

@ -681,7 +681,7 @@ class TinyGLTF {
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
#else #elif !defined(__ANDROID__)
#include <wordexp.h> #include <wordexp.h>
#endif #endif
@ -744,7 +744,7 @@ static std::string ExpandFilePath(const std::string &filepath) {
return s; return s;
#else #else
#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) #if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) || defined(__ANDROID__)
// no expansion // no expansion
std::string s = filepath; std::string s = filepath;
#else #else