From 264ae4c13100afb7d303a69764a47d103b3350dd Mon Sep 17 00:00:00 2001 From: Serdar Kocdemir Date: Sun, 30 Oct 2022 22:32:59 +0000 Subject: [PATCH] Avoid multiple asset_manager definition on Android Using TINYGLTF_IMPLEMENTATION to make the actual definition of the 'asset_manager' global variable. --- tiny_gltf.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tiny_gltf.h b/tiny_gltf.h index 3572388..5d1407f 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -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