[Scummvm-cvs-logs] SF.net SVN: scummvm:[55490] scummvm/trunk/engines/sword25

tdhs at users.sourceforge.net tdhs at users.sourceforge.net
Mon Jan 24 01:46:07 CET 2011


Revision: 55490
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55490&view=rev
Author:   tdhs
Date:     2011-01-24 00:46:06 +0000 (Mon, 24 Jan 2011)

Log Message:
-----------
SWORD25: Fix linker breakage from DECLARE_SINGLETON() in renderObjectRegistry.h.

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
    scummvm/trunk/engines/sword25/sword25.cpp

Modified: scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h	2011-01-24 00:04:32 UTC (rev 55489)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h	2011-01-24 00:46:06 UTC (rev 55490)
@@ -51,6 +51,4 @@
 
 } // End of namespace Sword25
 
-DECLARE_SINGLETON(Sword25::RenderObjectRegistry);
-
 #endif

Modified: scummvm/trunk/engines/sword25/sword25.cpp
===================================================================
--- scummvm/trunk/engines/sword25/sword25.cpp	2011-01-24 00:04:32 UTC (rev 55489)
+++ scummvm/trunk/engines/sword25/sword25.cpp	2011-01-24 00:46:06 UTC (rev 55490)
@@ -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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list