[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. 8126e33fc35c9c3930e0b8b2ba7813263d87c3aa

julio (none) julio at julio-desktop.
Tue May 25 20:42:12 UTC 2010 

The following commit has been merged in the master branch:
commit 8126e33fc35c9c3930e0b8b2ba7813263d87c3aa
Author: julio <julio at julio-desktop.(none)>
Date:   Tue May 25 15:39:58 2010 -0500

    tuxmath.c/.h changed to tuxhistory.c/.h
    also modified all references to the header

diff --git a/configure.ac b/configure.ac
index 3ba4704..1c8eef0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Of Math Command],[1.8.0],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
+AC_INIT([Tux Hisotry],[0.0.1],[tuxmath-devel at lists.sourceforge.net],[tuxhistory])
 
 AC_PREREQ(2.61)
 AC_CANONICAL_HOST
@@ -8,13 +8,13 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE(foreign)
-AC_CONFIG_SRCDIR([src/tuxmath.c])
+AC_CONFIG_SRCDIR([src/tuxhistory.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 NAME_VERSION=$PACKAGE-$VERSION
 
-AC_DEFINE_UNQUOTED([PROGRAM_NAME], "$PACKAGE", [Tux Of Math Command])
+AC_DEFINE_UNQUOTED([PROGRAM_NAME], "$PACKAGE", [Tux History])
 
 AC_SUBST(NAME_VERSION)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0e46567..276ae91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am for tuxmath src:
+## Makefile.am for tuxhisotry src:
 ## Process with Automake to create Makefile.in
 
 # Support for gettext:
@@ -25,7 +25,7 @@ else
 endif
 
 
-tuxhistory_SOURCES = tuxmath.c \
+tuxhistory_SOURCES = tuxhistory.c \
 	setup.c 	\
 	titlescreen.c	\
 	menu.c		\
@@ -53,8 +53,8 @@ tuxhistory_SOURCES = tuxmath.c \
 	throttle.c	
 
 
-# HACK "TuxMath" is the Windows program, whereas "tuxmath" is the Unix program
-TuxHistory_SOURCES  = $(tuxmath_SOURCES) tuxmathrc.rc
+# HACK "TuxHistory" is the Windows program, whereas "tuxhistory" is the Unix program
+TuxHistory_SOURCES  = $(tuxhistory_SOURCES) tuxmathrc.rc
 
 
 EXTRA_DIST = 	credits.h 	\
@@ -74,7 +74,7 @@ EXTRA_DIST = 	credits.h 	\
 	mathcards.h 	\
 	campaign.h	\
 	multiplayer.h	\
-	tuxmath.h	\
+	tuxhistory.h	\
 	convert_utf.h	\
 	SDL_extras.h	\
 	SDL_rotozoom.h	\
diff --git a/src/SDL_extras.c b/src/SDL_extras.c
index bb69b8f..be5a352 100644
--- a/src/SDL_extras.c
+++ b/src/SDL_extras.c
@@ -12,7 +12,7 @@
 #include <math.h>
 
 #include "SDL_extras.h"
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "loaders.h"
 #include "pixels.h"
 #include "options.h"
diff --git a/src/audio.c b/src/audio.c
index b5f15d7..bdfb4fe 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -21,7 +21,7 @@
 ***************************************************************************/
 
 
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "options.h"   //Needed for Opts_UsingSound()
 #include "titlescreen.h"
 
diff --git a/src/campaign.c b/src/campaign.c
index 2a8ad51..7a3bf00 100644
--- a/src/campaign.c
+++ b/src/campaign.c
@@ -5,7 +5,7 @@
  */
  
 #include "campaign.h"
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "credits.h"
 #include "titlescreen.h"
 #include "game.h"
diff --git a/src/campaign.h b/src/campaign.h
index d463100..a60aebb 100644
--- a/src/campaign.h
+++ b/src/campaign.h
@@ -8,7 +8,7 @@
  */
  
 #include "SDL_extras.h"
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "linewrap.h"
 
 
diff --git a/src/credits.c b/src/credits.c
index 73401aa..3636e95 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -23,7 +23,7 @@
 
 #include "SDL.h"
 
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "options.h"
 #include "fileops.h"
 #include "setup.h"
diff --git a/src/factoroids.c b/src/factoroids.c
index 243a245..d3652ca 100644
--- a/src/factoroids.c
+++ b/src/factoroids.c
@@ -18,7 +18,7 @@
  *  http://tux4kids.alioth.debian.org/                      *
  ************************************************************/
 
-#include "tuxmath.h"
+#include "tuxhistory.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/fileops_media.c b/src/fileops_media.c
index d511092..3db196f 100644
--- a/src/fileops_media.c
+++ b/src/fileops_media.c
@@ -1,4 +1,4 @@
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "fileops.h"
 #include "loaders.h"
 #include "options.h"
diff --git a/src/game.c b/src/game.c
index 9fbd7d0..287a851 100644
--- a/src/game.c
+++ b/src/game.c
@@ -19,7 +19,7 @@
 */
 
 /* put this first so we get <config.h> and <gettext.h> immediately: */
-#include "tuxmath.h"
+#include "tuxhistory.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/highscore.c b/src/highscore.c
index 64fe2f4..94e7e27 100644
--- a/src/highscore.c
+++ b/src/highscore.c
@@ -11,7 +11,7 @@
 */
 #include <string.h>
 
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "highscore.h"
 #include "menu.h"
 #include "titlescreen.h"
diff --git a/src/loaders.c b/src/loaders.c
index 742305f..ae15134 100644
--- a/src/loaders.c
+++ b/src/loaders.c
@@ -23,7 +23,7 @@
 
 #include "loaders.h"
 #include "globals.h"
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "setup.h"       // for cleanup_on_error()
 #include "SDL_extras.h"
 
diff --git a/src/loaders.h b/src/loaders.h
index 3839e9f..e5df094 100644
--- a/src/loaders.h
+++ b/src/loaders.h
@@ -16,7 +16,7 @@
 #ifndef LOADERS_H
 #define LOADERS_H
 
-#include "tuxmath.h"
+#include "tuxhistory.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/src/multiplayer.c b/src/multiplayer.c
index 0a036e1..496b053 100644
--- a/src/multiplayer.c
+++ b/src/multiplayer.c
@@ -8,7 +8,7 @@ Author: B. Luchen
 
 */
 
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "SDL_extras.h"
 #include "multiplayer.h"
 #include "game.h"
diff --git a/src/setup.c b/src/setup.c
index 5e08608..1cfea86 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -39,7 +39,7 @@
 #include "SDL_image.h"
 
 #include "options.h"
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "mathcards.h"
 #include "setup.h"
 #include "fileops.h"
diff --git a/src/setup.h b/src/setup.h
index 0fb1588..437db20 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -8,7 +8,7 @@
   and is called from the main setup function.
 
   Some globals are declared in setup.c - all globals throughout tuxmath
-  are now extern'd in the same place in tuxmath.h
+  are now extern'd in the same place in tuxhistory.h
 
   by Bill Kendrick
   bill at newbreedsoftware.com
diff --git a/src/titlescreen.c b/src/titlescreen.c
index 6e48388..e36e859 100644
--- a/src/titlescreen.c
+++ b/src/titlescreen.c
@@ -22,7 +22,7 @@
 
 #include "titlescreen.h"
 
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "options.h"
 #include "fileops.h"
 #include "setup.h"
diff --git a/src/titlescreen.h b/src/titlescreen.h
index 3e0734f..6058f53 100644
--- a/src/titlescreen.h
+++ b/src/titlescreen.h
@@ -46,7 +46,7 @@
 //#include "config.h"
 #endif
 
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "loaders.h"
 
 #define MAX_LESSONS                     100
diff --git a/src/tuxmath.c b/src/tuxhistory.c
similarity index 96%
rename from src/tuxmath.c
rename to src/tuxhistory.c
index 386a3a9..ea7e97e 100644
--- a/src/tuxmath.c
+++ b/src/tuxhistory.c
@@ -1,7 +1,7 @@
 /*
   tuxmath.c
 
-  Main function for TuxMath
+  Main function for TuxHistory 
   Calls functions in other modules (eg, "setup", "title", "game", etc.)
   as needed.
 
@@ -20,7 +20,7 @@
 */
 
 /* (tuxmath.h brings in "gettext.h" and <locale.h> */
-#include "tuxmath.h"
+#include "tuxhistory.h"
 #include "setup.h"
 #include "titlescreen.h"
 #include "linewrap.h"
diff --git a/src/tuxmath.h b/src/tuxhistory.h
similarity index 100%
rename from src/tuxmath.h
rename to src/tuxhistory.h

-- 
tuxhistory - Educational history game

More information about the Tux4kids-commits mailing list