From 9961e054d0b5b7d301eabdfdc54549609b49dbcf Mon Sep 17 00:00:00 2001
From: David Turner
Date: Mon, 24 Jan 2011 00:46:06 +0000
Subject: SWORD25: Fix linker breakage from DECLARE_SINGLETON() in
 renderObjectRegistry.h.

svn-id: r55490
---
 engines/sword25/gfx/renderobjectregistry.h | 2 --
 engines/sword25/sword25.cpp                | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines')

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 {
-- 
cgit v1.2.3