[Tux4kids-commits] r137 - tuxmath/trunk/src

[Tim Holy]

Author: tholy-guest
Date: 2007-03-15 12:08:55 +0000 (Thu, 15 Mar 2007)
New Revision: 137

Modified:
   tuxmath/trunk/src/fileops.c
   tuxmath/trunk/src/theme.c
   tuxmath/trunk/src/titlescreen.h
   tuxmath/trunk/src/tuxmath.c
   tuxmath/trunk/src/tuxmath.h
Log:
Build on MacOSX currently doesn't support internationalization; disable using ifndef MACOSX macros.


Modified: tuxmath/trunk/src/fileops.c
===================================================================
--- tuxmath/trunk/src/fileops.c	2007-03-15 11:58:45 UTC (rev 136)
+++ tuxmath/trunk/src/fileops.c	2007-03-15 12:08:55 UTC (rev 137)
@@ -26,7 +26,9 @@
 *
 */
 
+#ifndef MACOSX
 #include "../config.h"
+#endif
 
 /* Standard C includes: */
 #include <stdio.h>

Modified: tuxmath/trunk/src/theme.c
===================================================================
--- tuxmath/trunk/src/theme.c	2007-03-15 11:58:45 UTC (rev 136)
+++ tuxmath/trunk/src/theme.c	2007-03-15 12:08:55 UTC (rev 137)
@@ -27,8 +27,8 @@
 #include "fileops.h"
 #include "titlescreen.h"
 
+#ifndef MACOSX
 #define NUM_PATHS 5
-
 const char PATHS[NUM_PATHS][PATH_MAX] = {
 	"./data",
 	"/usr/share/"PACKAGE"/data",
@@ -36,7 +36,13 @@
         "/usr/local/share/"PACKAGE,        //HACK added to accomodate 'make install' installation
 	DATA_PREFIX"/share/"PACKAGE"/data"
 };
-
+#else
+#define NUM_PATHS 1
+const char PATHS[NUM_PATHS][PATH_MAX] = {
+	DATA_PREFIX"/data"
+};
+#endif
+	
 SDL_Surface *letters[255] = { NULL };
 unsigned char ALPHABET[256];
 unsigned char KEYMAP[256];

Modified: tuxmath/trunk/src/titlescreen.h
===================================================================
--- tuxmath/trunk/src/titlescreen.h	2007-03-15 11:58:45 UTC (rev 136)
+++ tuxmath/trunk/src/titlescreen.h	2007-03-15 12:08:55 UTC (rev 137)
@@ -59,7 +59,9 @@
 #include <SDL_mixer.h>
 #include <SDL_ttf.h>
 
+#ifndef MACOSX
 #include "../config.h"
+#endif
 
 #include "tuxmath.h"
 

Modified: tuxmath/trunk/src/tuxmath.c
===================================================================
--- tuxmath/trunk/src/tuxmath.c	2007-03-15 11:58:45 UTC (rev 136)
+++ tuxmath/trunk/src/tuxmath.c	2007-03-15 12:08:55 UTC (rev 137)
@@ -31,10 +31,12 @@
 
 int main(int argc, char * argv[])
 {
+#ifndef MACOSX
 setlocale( LC_ALL, "" );
 bindtextdomain( "tuxmath", LOCALEDIR );
 bind_textdomain_codeset("tuxmath", "UTF-8");
 textdomain( "tuxmath" );
+#endif
 /* Link control of tuxtype-derived code's debug to TUXMATH_DEBUG: */
   debugOn = 0; //for tuxtype-derived code  
 #ifdef TUXMATH_DEBUG

Modified: tuxmath/trunk/src/tuxmath.h
===================================================================
--- tuxmath/trunk/src/tuxmath.h	2007-03-15 11:58:45 UTC (rev 136)
+++ tuxmath/trunk/src/tuxmath.h	2007-03-15 12:08:55 UTC (rev 137)
@@ -23,11 +23,16 @@
 #define TUXMATH_H
 
 // Translation stuff:
+#ifndef MACOSX
 #include <libintl.h>
 #include <locale.h>
 #define _(String) gettext (String)
 #define gettext_noop(String) String
 #define N_(String) gettext_noop (String)
+#else
+#define N_(String) String
+#define _(String) String
+#endif
 
 #include <SDL.h>
 #include <SDL_ttf.h>