[Scummvm-cvs-logs] SF.net SVN: scummvm:[46329] scummvm/trunk/graphics
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Dec 10 22:40:38 CET 2009
Revision: 46329
http://scummvm.svn.sourceforge.net/scummvm/?rev=46329&view=rev
Author: lordhoto
Date: 2009-12-10 21:40:38 +0000 (Thu, 10 Dec 2009)
Log Message:
-----------
Hopefully fixing linking on MSVC:
Modified Paths:
--------------
scummvm/trunk/graphics/font.h
scummvm/trunk/graphics/fontman.cpp
Modified: scummvm/trunk/graphics/font.h
===================================================================
--- scummvm/trunk/graphics/font.h 2009-12-10 20:47:05 UTC (rev 46328)
+++ scummvm/trunk/graphics/font.h 2009-12-10 21:40:38 UTC (rev 46329)
@@ -146,8 +146,11 @@
n = new NewFont(desc); \
}
+#define FORWARD_DECLARE_FONT(n) \
+ extern const NewFont *n; \
+ extern void create_##n();
+
#define INIT_FONT(n) \
- extern void create_##n(); \
create_##n();
} // End of namespace Graphics
Modified: scummvm/trunk/graphics/fontman.cpp
===================================================================
--- scummvm/trunk/graphics/fontman.cpp 2009-12-10 20:47:05 UTC (rev 46328)
+++ scummvm/trunk/graphics/fontman.cpp 2009-12-10 21:40:38 UTC (rev 46329)
@@ -30,9 +30,9 @@
namespace Graphics {
const ScummFont *g_scummfont = 0;
-extern const NewFont *g_sysfont;
-extern const NewFont *g_sysfont_big;
-extern const NewFont *g_consolefont;
+FORWARD_DECLARE_FONT(g_sysfont)
+FORWARD_DECLARE_FONT(g_sysfont_big)
+FORWARD_DECLARE_FONT(g_consolefont)
FontManager::FontManager() {
// This assert should *never* trigger, because
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