Merge pull request #388 from stromaster/patch-1

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

View File

@@ -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