From edfae828f6a792fe4809ca77a1181a00ed8b9f46 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 27 Nov 2005 02:35:57 +0000
Subject: Patch #1341626: "New GP32 port"

svn-id: r19710
---
 graphics/consolefont.cpp | 2 +-
 graphics/font.h          | 2 +-
 graphics/fontman.cpp     | 4 ++--
 graphics/newfont.cpp     | 4 ++--
 graphics/newfont_big.cpp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'graphics')

diff --git a/graphics/consolefont.cpp b/graphics/consolefont.cpp
index 8572ad9868..5c95c4bb42 100644
--- a/graphics/consolefont.cpp
+++ b/graphics/consolefont.cpp
@@ -4777,7 +4777,7 @@ static const FontDesc desc = {
 	sizeof(_font_bits)/sizeof(bitmap_t)
 };
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 extern const NewFont g_consolefont(desc);
 #else
 DEFINE_FONT(g_consolefont)
diff --git a/graphics/font.h b/graphics/font.h
index b2781d58c3..4ba2d46255 100644
--- a/graphics/font.h
+++ b/graphics/font.h
@@ -116,7 +116,7 @@ public:
 	virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
 };
 
-#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 #	define DEFINE_FONT(n) \
 		const NewFont *n;	\
 		void create_##n() {	\
diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index e00aabe74b..090b211773 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -25,7 +25,7 @@ DECLARE_SINGLETON(Graphics::FontManager);
 
 namespace Graphics {
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 const ScummFont g_scummfont;
 extern const NewFont g_sysfont;
 extern const NewFont g_sysfont_big;
@@ -62,7 +62,7 @@ FontManager::FontManager() {
 
 const Font *FontManager::getFontByUsage(FontUsage usage) const {
 	switch (usage) {
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 	case kOSDFont:
 		return &g_scummfont;
 	case kConsoleFont:
diff --git a/graphics/newfont.cpp b/graphics/newfont.cpp
index 7febc2634b..c9d32fb044 100644
--- a/graphics/newfont.cpp
+++ b/graphics/newfont.cpp
@@ -2533,10 +2533,10 @@ static const FontDesc desc = {
 	sizeof(_font_bits)/sizeof(bitmap_t)
 };
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 extern const NewFont g_sysfont(desc);
 #else
-DEFINE_FONT(g_sysfont);
+DEFINE_FONT(g_sysfont)
 #endif
 
 } // End of namespace Graphics
diff --git a/graphics/newfont_big.cpp b/graphics/newfont_big.cpp
index c0ab341d3a..5bade19fed 100644
--- a/graphics/newfont_big.cpp
+++ b/graphics/newfont_big.cpp
@@ -6987,7 +6987,7 @@ static const FontDesc desc = {
 	sizeof(_font_bits)/sizeof(bitmap_t)
 };
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 extern const NewFont g_sysfont_big(desc);
 #else
 DEFINE_FONT(g_sysfont_big)
-- 
cgit v1.2.3