[Tux4kids-commits] r1340 - branches/commonification/tuxmath/trunk/src

[Bolesław Kulbabiński]

Author: bolekk-guest
Date: 2009-08-03 16:53:01 +0000 (Mon, 03 Aug 2009)
New Revision: 1340

Modified:
   branches/commonification/tuxmath/trunk/src/SDL_extras.c
   branches/commonification/tuxmath/trunk/src/audio.c
   branches/commonification/tuxmath/trunk/src/compiler.h
   branches/commonification/tuxmath/trunk/src/loaders.c
   branches/commonification/tuxmath/trunk/src/loaders.h
   branches/commonification/tuxmath/trunk/src/menu.c
   branches/commonification/tuxmath/trunk/src/pixels.c
Log:
added ifndefs to exclude copied code when using t4kcommon

Modified: branches/commonification/tuxmath/trunk/src/SDL_extras.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/SDL_extras.c	2009-08-03 15:00:00 UTC (rev 1339)
+++ branches/commonification/tuxmath/trunk/src/SDL_extras.c	2009-08-03 16:53:01 UTC (rev 1340)
@@ -9,6 +9,7 @@
 * Copyright: GPL v3 or later
 *
 */
+#ifndef HAVE_LIBT4KCOMMON
 #include <math.h>
 
 #include "SDL_extras.h"
@@ -19,7 +20,6 @@
 
 
 SDL_Surface* screen = NULL;
-#ifndef HAVE_LIBT4KCOMMON
 
 
 /* window size */

Modified: branches/commonification/tuxmath/trunk/src/audio.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/audio.c	2009-08-03 15:00:00 UTC (rev 1339)
+++ branches/commonification/tuxmath/trunk/src/audio.c	2009-08-03 16:53:01 UTC (rev 1340)
@@ -20,6 +20,7 @@
 *                                                                         *
 ***************************************************************************/
 
+#ifndef HAVE_LIBT4KCOMMON
 
 #include "tuxmath.h"
 #include "options.h"   //Needed for Opts_UsingSound()
@@ -82,3 +83,4 @@
     return (defaultMusic != NULL);
 }
 
+#endif //HAVE_LIBT4KCOMMON

Modified: branches/commonification/tuxmath/trunk/src/compiler.h
===================================================================
--- branches/commonification/tuxmath/trunk/src/compiler.h	2009-08-03 15:00:00 UTC (rev 1339)
+++ branches/commonification/tuxmath/trunk/src/compiler.h	2009-08-03 16:53:01 UTC (rev 1340)
@@ -33,6 +33,7 @@
 
 */
 
+#ifndef HAVE_LIBT4KCOMMON
 #ifdef WIN32
 /* Horrible, dangerous macros. */
 /*
@@ -155,3 +156,4 @@
 #undef CLOCK_ASM
 #define CLOCK_ASM(x) x=42
 #endif
+#endif //HAVE_LIBT4KCOMMON

Modified: branches/commonification/tuxmath/trunk/src/loaders.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/loaders.c	2009-08-03 15:00:00 UTC (rev 1339)
+++ branches/commonification/tuxmath/trunk/src/loaders.c	2009-08-03 16:53:01 UTC (rev 1340)
@@ -21,6 +21,8 @@
   Copyright: See COPYING file that comes with this distribution.
 */
 
+#ifndef HAVE_LIBT4KCOMMON
+
 #include "loaders.h"
 #include "globals.h"
 #include "SDL_extras.h"
@@ -622,3 +624,4 @@
   return tempMusic;
 }
 
+#endif //HAVE_LIBT4KCOMMON

Modified: branches/commonification/tuxmath/trunk/src/loaders.h
===================================================================
--- branches/commonification/tuxmath/trunk/src/loaders.h	2009-08-03 15:00:00 UTC (rev 1339)
+++ branches/commonification/tuxmath/trunk/src/loaders.h	2009-08-03 16:53:01 UTC (rev 1340)
@@ -13,6 +13,7 @@
   Copyright: See COPYING file that comes with this distribution.
 */
 
+#ifndef HAVE_LIBT4KCOMMON
 #ifndef LOADERS_H
 #define LOADERS_H
 
@@ -53,3 +54,4 @@
 Mix_Music*   LoadMusic(char *datafile);
 
 #endif /* LOADERS_H */
+#endif //HAVE_LIBT4KCOMMON

Modified: branches/commonification/tuxmath/trunk/src/menu.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/menu.c	2009-08-03 15:00:00 UTC (rev 1339)
+++ branches/commonification/tuxmath/trunk/src/menu.c	2009-08-03 16:53:01 UTC (rev 1340)
@@ -11,6 +11,7 @@
   Copyright: See COPYING file that comes with this distribution.
 */
 
+#ifndef HAVE_LIBT4KCOMMON
 #include "globals.h"
 #include "menu.h"
 #include "loaders.h"
@@ -1064,3 +1065,4 @@
   DEBUGMSG(debug_menu, "leaving UnloadMenus()\n");
 }
 
+#endif //HAVE_LIBT4KCOMMON

Modified: branches/commonification/tuxmath/trunk/src/pixels.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/pixels.c	2009-08-03 15:00:00 UTC (rev 1339)
+++ branches/commonification/tuxmath/trunk/src/pixels.c	2009-08-03 16:53:01 UTC (rev 1340)
@@ -27,6 +27,7 @@
   $Id: pixels.c,v 1.3 2006/08/27 21:00:55 wkendrick Exp $
 */
 
+#ifndef HAVE_LIBT4KCOMMON
 #include "pixels.h"
 #include "compiler.h"
 //#include "debug.h"
@@ -255,3 +256,4 @@
 Uint32(*getpixels[])(SDL_Surface *, int, int) =
 {
 getpixel8, getpixel8, getpixel16, getpixel24, getpixel32};
+#endif //HAVE_LIBT4KCOMMON