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

Merge pull request #388 from stromaster/patch-1

Browse Source 
Avoid multiple asset_manager definitions on Android
This commit is contained in:
Syoyo Fujita 2022-10-31 17:40:40 +09:00 committed by GitHub
commit 9bdd256625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tiny_gltf.h
View File

@ -200,7 +200,11 @@ namespace tinygltf {
#ifdef __ANDROID__ #ifdef __ANDROID__
#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS #ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
#ifdef TINYGLTF_IMPLEMENTATION
AAssetManager *asset_manager = nullptr; AAssetManager *asset_manager = nullptr;
#else
extern AAssetManager *asset_manager;
#endif
#endif #endif
#endif #endif