aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Turner2011-01-24 00:46:06 +0000
committerDavid Turner2011-01-24 00:46:06 +0000
commit9961e054d0b5b7d301eabdfdc54549609b49dbcf (patch)
treefaa8ea7e40b448e2bcd267d787a2ca7ff9ef7ff0
parent092da739293c8c14c4fb194e253c550d25fd0f99 (diff)
downloadscummvm-rg350-9961e054d0b5b7d301eabdfdc54549609b49dbcf.tar.gz
scummvm-rg350-9961e054d0b5b7d301eabdfdc54549609b49dbcf.tar.bz2
scummvm-rg350-9961e054d0b5b7d301eabdfdc54549609b49dbcf.zip
SWORD25: Fix linker breakage from DECLARE_SINGLETON() in renderObjectRegistry.h.
svn-id: r55490
-rw-r--r--engines/sword25/gfx/renderobjectregistry.h2
-rw-r--r--engines/sword25/sword25.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/engines/sword25/gfx/renderobjectregistry.h b/engines/sword25/gfx/renderobjectregistry.h
index af63c746cb..988b676aa8 100644
--- a/engines/sword25/gfx/renderobjectregistry.h
+++ b/engines/sword25/gfx/renderobjectregistry.h
@@ -51,6 +51,4 @@ class RenderObjectRegistry :
} // End of namespace Sword25
-DECLARE_SINGLETON(Sword25::RenderObjectRegistry);
-
#endif
diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp
index f7be658654..55b9aa340d 100644
--- a/engines/sword25/sword25.cpp
+++ b/engines/sword25/sword25.cpp
@@ -45,6 +45,7 @@
#include "sword25/gfx/animationtemplateregistry.h" // Needed so we can destroy the singleton
#include "sword25/gfx/renderobjectregistry.h" // Needed so we can destroy the singleton
+DECLARE_SINGLETON(Sword25::RenderObjectRegistry);
#include "sword25/math/regionregistry.h" // Needed so we can destroy the singleton
namespace Sword25 {