[Tux4kids-commits] r59 - in tuxmath/trunk: . docs src
dbruce at alioth.debian.org
dbruce at alioth.debian.org
Thu Mar 8 21:23:13 CET 2007
Author: dbruce
Date: 2006-11-17 11:10:26 +0000 (Fri, 17 Nov 2006)
New Revision: 59
Modified:
tuxmath/trunk/configure.in
tuxmath/trunk/docs/INSTALL.txt
tuxmath/trunk/docs/README.txt
tuxmath/trunk/src/fileops.c
tuxmath/trunk/src/options.c
Log:
fixed bug in Opts_SetMaxComets()
Modified: tuxmath/trunk/configure.in
===================================================================
--- tuxmath/trunk/configure.in 2006-11-01 12:41:16 UTC (rev 58)
+++ tuxmath/trunk/configure.in 2006-11-17 11:10:26 UTC (rev 59)
@@ -50,20 +50,17 @@
LIBS="$LIBS $SDL_LIBS"
# Checks for libraries.
-# FIXME: Replace `main' with a function in `-lSDL_image':
dnl Checks for libraries.
-dnl Replace `main' with a function in -lSDL_image:
-AC_CHECK_LIB(SDL_image,
- main,
+AC_CHECK_LIB([SDL_image],
+ [IMG_Load],
LIBS="$LIBS -lSDL_image",
- AC_MSG_ERROR([*** SDL_image library not found!])
+ [AC_MSG_ERROR([*** SDL_image library not found!])]
)
dnl Checks for libraries.
-dnl Replace `main' with a function in -lSDL_mixer:
-AC_CHECK_LIB(SDL_mixer,
- Mix_OpenAudio,
+AC_CHECK_LIB([SDL_mixer],
+ [Mix_OpenAudio],
LIBS="$LIBS -lSDL_mixer",
- AC_MSG_ERROR([*** SDL_mixer library not found!])
+ [AC_MSG_ERROR([*** SDL_mixer library not found!])]
)
# Checks for header files.
@@ -97,6 +94,8 @@
AC_SUBST(PACKAGE_DATA_DIR)
+
+# Support for building NSIS Win32 installer:
NSI_INSTALL_DIR=mingw32
AC_SUBST(NSI_INSTALL_DIR)
@@ -127,11 +126,11 @@
AC_PATH_PROG(NSIS, makensis, no, [$PATH])
-#AC_CONFIG_FILES([Makefile])
-
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
src/Makefile
nsis/tuxmath.nsi
nsis/tuxmath_with_conf.nsi
])
+
+AC_OUTPUT
Modified: tuxmath/trunk/docs/INSTALL.txt
===================================================================
--- tuxmath/trunk/docs/INSTALL.txt 2006-11-01 12:41:16 UTC (rev 58)
+++ tuxmath/trunk/docs/INSTALL.txt 2006-11-17 11:10:26 UTC (rev 59)
@@ -169,30 +169,29 @@
The header files can be in their own folders as long as they are under
/usr/local/cross-tools/i586-mingw32msvc/include
- 4. install libgw32c (the dev file):
+ 4. Install libgw32c (the dev file):
http://gnuwin32.sourceforge.net/packages/libgw32c.htm in the same directory.
This gives you the file "libgw32c.a" that you need to have in the lib directory.
- 5. From the trunk dir, run:
- ./autogen.sh
- ./cross-configure.sh --with-sdl-prefix
- ./cross-make.sh
+ 5. You need to have a directory containing all of the dlls that will need to be
+ packaged into the installer. The Makefile expects them to be in NSI_DLL_DIR,
+ which is set to ~/tuxmath_dll. On my machine, this contains:
- You should now have the tuxmath.exe executable in the trunk/mingw32 directory,
- which should have been created by cross-make.sh. Also, you need to have a directory
- containing all of the dlls that will need to be packaged into the installer. The
- Makefile expects them to be in NSI_DLL_DIR, which is set to ~/tuxmath_dll. On my
- machine, this contains:
+ dbruce at debian:~/tuxmath_dll$ ls
+ SDL.dll jpeg.dll
+ SDL_image.dll libpng12.dll smpeg.dll zlib1.dll
+ SDL_mixer.dll libtiff.dll
- dbruce at debian:~/tuxmath_dll$ ls
- SDL.dll jpeg.dll
- SDL_image.dll libpng12.dll smpeg.dll zlib1.dll
- SDL_mixer.dll libtiff.dll
+ (Note - this has mostly the same files as the cross-tools lib directory - it is most
+ likely possible to eliminate this redundancy in some way.).
- (Note - this has mostly the same files as the cross-tools lib directory - it is most
- likely possible to eliminate this redundancy in some way.).
+ 6. If you have done a native (Linux) build in the same source tree, run "make clean"
+ and "make distclean" to get rid of the autogenerated files.
- 6. From the trunk dir, run:
+ 7. From the trunk dir, run:
+ ./autogen.sh
+ ./cross-configure.sh --with-sdl-prefix
+ ./cross-make.sh
./cross-make.sh nsis
This should create the windows installer file ("tuxmath-1.0-win32-installer.exe")
Modified: tuxmath/trunk/docs/README.txt
===================================================================
--- tuxmath/trunk/docs/README.txt 2006-11-01 12:41:16 UTC (rev 58)
+++ tuxmath/trunk/docs/README.txt 2006-11-17 11:10:26 UTC (rev 59)
@@ -308,11 +308,11 @@
Setting Administrative Options
------------------------------
- "Tux, of Math Command" allows parents/teachers to adjust which parts
- of the game options can be changed by the player.
+ "Tux, of Math Command" allows parents/teachers to control whether the game
+ options can be changed by the player.
The game options are first read from a master config file in the program's
- data directory (/usr/local/share/tuxmath/options on *nix if installed
+ data directory (/usr/local/share/tuxmath/missions/options on *nix if installed
using "make install"), then overridden by the user's own /.tuxmath/options
file if "per_user_config" is selected in the master options file.
If "per_user_config" is deselected, the game starts up with the master
Modified: tuxmath/trunk/src/fileops.c
===================================================================
--- tuxmath/trunk/src/fileops.c 2006-11-01 12:41:16 UTC (rev 58)
+++ tuxmath/trunk/src/fileops.c 2006-11-17 11:10:26 UTC (rev 59)
@@ -703,9 +703,7 @@
else if(0 == strcasecmp(parameter, "copies_repeated_wrongs"))
{
- int v = str_to_bool(value);
- if (v != -1)
- MC_SetCopiesRepeatedWrongs(v);
+ MC_SetCopiesRepeatedWrongs(atoi(value));
}
else if(0 == strcasecmp(parameter, "question_copies"))
Modified: tuxmath/trunk/src/options.c
===================================================================
--- tuxmath/trunk/src/options.c 2006-11-01 12:41:16 UTC (rev 58)
+++ tuxmath/trunk/src/options.c 2006-11-17 11:10:26 UTC (rev 59)
@@ -558,7 +558,7 @@
fprintf(stderr,"Warning: requested max comets above Tuxmath's maximum, setting to %d.\n",
MAX_MAX_COMETS);
}
- game_options->extra_comets_per_wave = val;
+ game_options->max_comets = val;
}
More information about the Tux4kids-commits
mailing list