From 998607b1067c453df0d1ad1a450d72faab5fd922 Mon Sep 17 00:00:00 2001 From: Naios Date: Fri, 11 Mar 2016 18:55:33 +0100 Subject: Core/Common: Move singleton instances into compilation units * Fixes issues when building shared libraries (prevents gcc and clang from providing several instance) (cherry picked from commit 5c91586797f199259567629a1d4d3f987c73e53c) --- src/common/Collision/Models/GameObjectModel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/common/Collision/Models/GameObjectModel.h') diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h index 9d8687233c1..7834f53c63a 100644 --- a/src/common/Collision/Models/GameObjectModel.h +++ b/src/common/Collision/Models/GameObjectModel.h @@ -84,4 +84,6 @@ private: std::unique_ptr owner; }; +void LoadGameObjectModelList(std::string const& dataPath); + #endif // _GAMEOBJECT_MODEL_H -- cgit v1.2.3