[Tux4kids-commits] r416 - tuxtype/trunk/tuxtype

[alexsrsd13-guest at alioth.debian.org]

Author: alexsrsd13-guest
Date: 2008-01-29 18:44:07 +0000 (Tue, 29 Jan 2008)
New Revision: 416

Modified:
   tuxtype/trunk/tuxtype/alphabet.c
Log:
Added infdef MACOSX statements to disable SDL_Pango.  The added statements mirror the Win32 code for disabling SDL_Pango.  SDL_Pango has many required libraries that would make porting a nightmare.  

diff alphabet.c ~/alphabet.c
22d21
< #ifndef MACOSX
25d23
< #endif
89d86
< #ifndef MACOSX
92d88
< #endif
265d260
< #ifndef MACOSX
268d262
< #endif
327d320
< #ifndef MACOSX
456d448
< #endif

Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c	2008-01-29 18:25:09 UTC (rev 415)
+++ tuxtype/trunk/tuxtype/alphabet.c	2008-01-29 18:44:07 UTC (rev 416)
@@ -19,8 +19,10 @@
 
 /* Needed to handle rendering issues for Indic languages*/
 #ifndef WIN32
+#ifndef MACOSX
 #include <SDL_Pango.h>
 #endif
+#endif
 
 /* Needed to convert UTF-8 under Windows because we don't have glibc: */
 #include "ConvertUTF.h"  
@@ -84,8 +86,10 @@
 int check_needed_unicodes_str(const wchar_t* s);
 
 #ifndef WIN32
+#ifndef MACOSX
 static SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color* cl);
 #endif
+#endif
 
 
 
@@ -258,8 +262,10 @@
 
 /* Simply passthrough to SDLPango version if available (i.e. not under Windows):*/
 #ifndef WIN32
+#ifndef MACOSX
 return BlackOutline_SDLPango(t, font, c);
 #endif
+#endif
 
 
   if (!t || !font || !c)
@@ -318,6 +324,7 @@
 
 
 #ifndef WIN32
+#ifndef MACOSX
 /*Convert SDL_Colour to SDLPango_Matrix*/
 
 SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color *cl)
@@ -446,6 +453,7 @@
 }
 
 #endif
+#endif
 /* End of win32-excluded coded */