[Tux4kids-commits] r1627 - in branches/commonification: t4kcommon/trunk/src tuxmath/trunk/src

[David Bruce]

Author: dbruce-guest
Date: 2009-10-29 14:35:48 +0000 (Thu, 29 Oct 2009)
New Revision: 1627

Modified:
   branches/commonification/t4kcommon/trunk/src/t4k-common.h
   branches/commonification/t4kcommon/trunk/src/t4k-menu.c
   branches/commonification/tuxmath/trunk/src/titlescreen.c
   branches/commonification/tuxmath/trunk/src/tuxmath.h
Log:
Inactivated #define _(String) gettext (String) in t4kcommon - now can build and install t4kcommon and tuxmath but tuxmath won
t yet run - doesn't find shared lib at runtime

Modified: branches/commonification/t4kcommon/trunk/src/t4k-common.h
===================================================================
--- branches/commonification/t4kcommon/trunk/src/t4k-common.h	2009-10-29 14:35:39 UTC (rev 1626)
+++ branches/commonification/t4kcommon/trunk/src/t4k-common.h	2009-10-29 14:35:48 UTC (rev 1627)
@@ -28,7 +28,10 @@
 #define amask 0xff000000
 #endif
 
-#define _(String) gettext (String)
+//Hold off on gettext until we decide if we are really going to
+//use it from within t4kcommon - DSB
+#define _(String) String
+//#define _(String) gettext (String)
 
 typedef enum { false, true } bool;
 

Modified: branches/commonification/t4kcommon/trunk/src/t4k-menu.c
===================================================================
--- branches/commonification/t4kcommon/trunk/src/t4k-menu.c	2009-10-29 14:35:39 UTC (rev 1626)
+++ branches/commonification/t4kcommon/trunk/src/t4k-menu.c	2009-10-29 14:35:48 UTC (rev 1627)
@@ -19,6 +19,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+/* TODO do we want t4k-common to use gettext directly, or should we     */
+/* rely on the game programs to pass t4k-common the translated strings? */
+/* The latter would seem to make sense, but I don't quite see how we    */
+/* would then translate the menu entries that this file reads from the  */
+/* menu.xml files. It seems the code ought to be here, but the data and */
+/* po files would belong to tuxmath or tuxtype.  I really don't know    */
+/* how this should work.  For now I'm inactivating the gettext() define - DSB */                                         
 
 /*
   representation of a menu tree node

Modified: branches/commonification/tuxmath/trunk/src/titlescreen.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/titlescreen.c	2009-10-29 14:35:39 UTC (rev 1626)
+++ branches/commonification/tuxmath/trunk/src/titlescreen.c	2009-10-29 14:35:48 UTC (rev 1627)
@@ -39,9 +39,10 @@
 #include "SDL_extras.h"
 #include "menu.h"
 
-#ifdef HAVE_LIBT4KCOMMON
-#include <t4kcommon/t4kcommon.h>
-#endif
+//NOTE tuxmath.h takes care of this:
+//#ifdef HAVE_LIBT4KCOMMON
+//#include <t4kcommon/t4kcommon.h>
+//#endif
 
 /* these are all menu choices that are available in tuxmath.
    By using a define we can create both an enum and

Modified: branches/commonification/tuxmath/trunk/src/tuxmath.h
===================================================================
--- branches/commonification/tuxmath/trunk/src/tuxmath.h	2009-10-29 14:35:39 UTC (rev 1626)
+++ branches/commonification/tuxmath/trunk/src/tuxmath.h	2009-10-29 14:35:48 UTC (rev 1627)
@@ -25,7 +25,7 @@
 #include "config.h"
 
 #ifdef HAVE_LIBT4KCOMMON
-#include <t4kcommon/t4kcommon.h>
+#include <t4k-common.h>
 #endif
 
 // Translation stuff (now works for Mac and Win too!):