mirror of
https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git
synced 2025-08-16 13:55:58 +08:00
Merge pull request #388 from stromaster/patch-1
Avoid multiple asset_manager definitions on Android
This commit is contained in:
commit
9bdd256625
@ -200,7 +200,11 @@ namespace tinygltf {
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
|
||||
#ifdef TINYGLTF_IMPLEMENTATION
|
||||
AAssetManager *asset_manager = nullptr;
|
||||
#else
|
||||
extern AAssetManager *asset_manager;
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user