[Tux4kids-commits] r193 - in tuxtype: branches/tuxtype-indic branches/tuxtype-indic/tuxtype branches/tuxtype-indic/tuxtype/data/images branches/tuxtype-indic/tuxtype/data/images/backgrounds branches/tuxtype-indic/tuxtype/data/images/cities branches/tuxtype-indic/tuxtype/data/images/comets branches/tuxtype-indic/tuxtype/data/images/hands branches/tuxtype-indic/tuxtype/data/images/keyboard branches/tuxtype-indic/tuxtype/data/images/menu branches/tuxtype-indic/tuxtype/data/images/status branches/tuxtype-indic/tuxtype/data/images/tux branches/tuxtype-indic/tuxtype/data/scripts branches/tuxtype-indic/tuxtype/data/sounds branches/tuxtype-indic/tuxtype/data/themes/armenian branches/tuxtype-indic/tuxtype/data/themes/armenian/images branches/tuxtype-indic/tuxtype/data/themes/bokmal branches/tuxtype-indic/tuxtype/data/themes/bokmal/images branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status branches/tuxtype-indic/tuxtype/data/themes/bokmal/words branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words branches/tuxtype-indic/tuxtype/data/themes/catalan branches/tuxtype-indic/tuxtype/data/themes/catalan/words branches/tuxtype-indic/tuxtype/data/themes/dansk branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds branches/tuxtype-indic/tuxtype/data/themes/dansk/words branches/tuxtype-indic/tuxtype/data/themes/deutsch branches/tuxtype-indic/tuxtype/data/themes/deutsch/words branches/tuxtype-indic/tuxtype/data/themes/espanol branches/tuxtype-indic/tuxtype/data/themes/espanol/images branches/tuxtype-indic/tuxtype/data/themes/espanol/words branches/tuxtype-indic/tuxtype/data/themes/euskara branches/tuxtype-indic/tuxtype/data/themes/euskara/images branches/tuxtype-indic/tuxtype/data/themes/euskara/words branches/tuxtype-indic/tuxtype/data/themes/french branches/tuxtype-indic/tuxtype/data/themes/french/words branches/tuxtype-indic/tuxtype/data/themes/greek branches/tuxtype-indic/tuxtype/data/themes/greek/words branches/tuxtype-indic/tuxtype/data/themes/italian branches/tuxtype-indic/tuxtype/data/themes/italian/words branches/tuxtype-indic/tuxtype/data/themes/jamaican branches/tuxtype-indic/tuxtype/data/themes/jamaican/images branches/tuxtype-indic/tuxtype/data/themes/jamaican/words branches/tuxtype-indic/tuxtype/data/themes/lithuanian branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words branches/tuxtype-indic/tuxtype/data/themes/malayalam/images branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status branches/tuxtype-indic/tuxtype/data/themes/nederlands branches/tuxtype-indic/tuxtype/data/themes/nederlands/words branches/tuxtype-indic/tuxtype/data/themes/nynorsk branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words branches/tuxtype-indic/tuxtype/data/themes/russian branches/tuxtype-indic/tuxtype/data/themes/russian/images branches/tuxtype-indic/tuxtype/data/themes/russian/images/status branches/tuxtype-indic/tuxtype/data/themes/russian/words branches/tuxtype-indic/tuxtype/data/themes/svenska branches/tuxtype-indic/tuxtype/data/themes/svenska/words branches/tuxtype-indic/tuxtype/data/themes/swahili branches/tuxtype-indic/tuxtype/data/themes/swahili/words branches/tuxtype-indic/tuxtype/data/words branches/tuxtype-indic/tuxtype/docs branches/tuxtype-indic/tuxtype/docs/en trunk trunk/tuxtype
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Wed Aug 1 23:02:27 UTC 2007
Author: dbruce-guest
Date: 2007-08-01 23:02:27 +0000 (Wed, 01 Aug 2007)
New Revision: 193
Modified:
tuxtype/branches/tuxtype-indic/config.h.in
tuxtype/branches/tuxtype-indic/config.log
tuxtype/branches/tuxtype-indic/configure
tuxtype/branches/tuxtype-indic/configure.ac
tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c
tuxtype/branches/tuxtype-indic/tuxtype/data/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/images/backgrounds/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/images/cities/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/images/comets/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/images/keyboard/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/images/menu/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/images/status/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/images/tux/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/sounds/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/status/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/data/words/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/docs/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/docs/en/Makefile.in
tuxtype/branches/tuxtype-indic/tuxtype/globals.h
tuxtype/branches/tuxtype-indic/tuxtype/main.c
tuxtype/branches/tuxtype-indic/tuxtype/practice.c
tuxtype/trunk/ChangeLog
tuxtype/trunk/configure
tuxtype/trunk/tuxtype/Makefile.am
tuxtype/trunk/tuxtype/Makefile.in
tuxtype/trunk/tuxtype/alphabet.c
tuxtype/trunk/tuxtype/audio.c
tuxtype/trunk/tuxtype/funcs.h
tuxtype/trunk/tuxtype/gettext.c
tuxtype/trunk/tuxtype/globals.h
tuxtype/trunk/tuxtype/laser.c
tuxtype/trunk/tuxtype/loaders.c
tuxtype/trunk/tuxtype/main.c
tuxtype/trunk/tuxtype/pause.c
tuxtype/trunk/tuxtype/playgame.c
tuxtype/trunk/tuxtype/practice.c
tuxtype/trunk/tuxtype/scripting.c
tuxtype/trunk/tuxtype/setup.c
tuxtype/trunk/tuxtype/theme.c
tuxtype/trunk/tuxtype/titlescreen.c
Log:
Starting to merge in work from Indic subproject; code cleanup;
Modified: tuxtype/branches/tuxtype-indic/config.h.in
===================================================================
--- tuxtype/branches/tuxtype-indic/config.h.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/config.h.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -15,6 +15,9 @@
/* Define to 1 if you have the `SDL_mixer' library (-lSDL_mixer). */
#undef HAVE_LIBSDL_MIXER
+/* Define to 1 if you have the `SDL_Pango' library (-lSDL_Pango). */
+#undef HAVE_LIBSDL_PANGO
+
/* Define to 1 if you have the `SDL_ttf' library (-lSDL_ttf). */
#undef HAVE_LIBSDL_TTF
Modified: tuxtype/branches/tuxtype-indic/config.log
===================================================================
--- tuxtype/branches/tuxtype-indic/config.log 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/config.log 2007-08-01 23:02:27 UTC (rev 193)
@@ -1,20 +1,20 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tuxtype configure 1.5.9, which was
+It was created by tuxtype configure 1.5.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
- $ ./configure
+ $ configure --cache-file=cross-config.cache --target=i586-mingw32msvc --host=i586-mingw32msvc --build=i386-linux --prefix=/usr/local/cross-tools/i586-mingw32msvc --with-sdl-prefix
## --------- ##
## Platform. ##
## --------- ##
-hostname = stallman
+hostname = debian
uname -m = x86_64
-uname -r = 2.6.18-4-amd64
+uname -r = 2.6.20
uname -s = Linux
-uname -v = #1 SMP Mon Mar 26 19:17:44 UTC 2007
+uname -v = #1 SMP PREEMPT Thu Mar 29 14:40:23 EDT 2007
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
@@ -27,10 +27,12 @@
/usr/bin/oslevel = unknown
/bin/universe = unknown
+PATH: /usr/local/cross-tools/bin
+PATH: /usr/local/cross-tools/i586-mingw32msvc/bin
+PATH: /home/dbruce/bin
PATH: /usr/local/bin
PATH: /usr/bin
PATH: /bin
-PATH: /usr/bin/X11
PATH: /usr/games
@@ -38,12 +40,13 @@
## Core tests. ##
## ----------- ##
+configure:1682: creating cache cross-config.cache
configure:1804: checking build system type
-configure:1822: result: x86_64-unknown-linux-gnu
+configure:1822: result: i386-pc-linux-gnu
configure:1844: checking host system type
-configure:1859: result: x86_64-unknown-linux-gnu
+configure:1859: result: i586-pc-mingw32msvc
configure:1881: checking target system type
-configure:1896: result: x86_64-unknown-linux-gnu
+configure:1896: result: i586-pc-mingw32msvc
configure:1941: checking for a BSD-compatible install
configure:1997: result: /usr/bin/install -c
configure:2008: checking whether build environment is sane
@@ -51,64 +54,66 @@
configure:2079: checking for a thread-safe mkdir -p
configure:2118: result: /bin/mkdir -p
configure:2131: checking for gawk
-configure:2147: found /usr/bin/gawk
-configure:2158: result: gawk
+configure:2161: result: no
+configure:2131: checking for mawk
+configure:2147: found /usr/bin/mawk
+configure:2158: result: mawk
configure:2169: checking whether make sets $(MAKE)
configure:2190: result: yes
-configure:2430: checking for gcc
-configure:2446: found /usr/bin/gcc
-configure:2457: result: gcc
+configure:2270: checking for i586-mingw32msvc-strip
+configure:2286: found /usr/bin/i586-mingw32msvc-strip
+configure:2297: result: i586-mingw32msvc-strip
+configure:2390: checking for i586-mingw32msvc-gcc
+configure:2406: found /usr/bin/i586-mingw32msvc-gcc
+configure:2417: result: i586-mingw32msvc-gcc
configure:2695: checking for C compiler version
-configure:2702: gcc --version >&5
-gcc (GCC) 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)
-Copyright (C) 2006 Free Software Foundation, Inc.
+configure:2702: i586-mingw32msvc-gcc --version >&5
+i586-mingw32msvc-gcc (GCC) 3.4.5 (mingw special)
+Copyright (C) 2004 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
configure:2705: $? = 0
-configure:2712: gcc -v >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --with-tune=i686 --enable-checking=release i486-linux-gnu
-Thread model: posix
-gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)
+configure:2712: i586-mingw32msvc-gcc -v >&5
+Reading specs from /usr/lib/gcc/i586-mingw32msvc/3.4.5/specs
+Configured with: /home/ron/devel/debian/mingw32/mingw32-3.4.5.20060117.1.dfsg/build_dir/src/gcc-3.4.5-20060117-1-dfsg/configure -v --prefix=/usr --target=i586-mingw32msvc --enable-languages=c,c++ --enable-threads --enable-sjlj-exceptions --disable-multilib --enable-version-specific-runtime-libs
+Thread model: win32
+gcc version 3.4.5 (mingw special)
configure:2715: $? = 0
-configure:2722: gcc -V >&5
-gcc: '-V' option must have argument
+configure:2722: i586-mingw32msvc-gcc -V >&5
+i586-mingw32msvc-gcc: `-V' option must have argument
configure:2725: $? = 1
configure:2748: checking for C compiler default output file name
-configure:2775: gcc conftest.c >&5
+configure:2775: i586-mingw32msvc-gcc -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c >&5
configure:2778: $? = 0
-configure:2816: result: a.out
+configure:2816: result: a.exe
configure:2833: checking whether the C compiler works
-configure:2843: ./a.out
-configure:2846: $? = 0
configure:2863: result: yes
configure:2870: checking whether we are cross compiling
-configure:2872: result: no
+configure:2872: result: yes
configure:2875: checking for suffix of executables
-configure:2882: gcc -o conftest conftest.c >&5
+configure:2882: i586-mingw32msvc-gcc -o conftest.exe -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c >&5
configure:2885: $? = 0
-configure:2909: result:
+configure:2909: result: .exe
configure:2915: checking for suffix of object files
-configure:2941: gcc -c conftest.c >&5
+configure:2941: i586-mingw32msvc-gcc -c -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
configure:2944: $? = 0
configure:2967: result: o
configure:2971: checking whether we are using the GNU C compiler
-configure:3000: gcc -c conftest.c >&5
+configure:3000: i586-mingw32msvc-gcc -c -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
configure:3006: $? = 0
configure:3023: result: yes
-configure:3028: checking whether gcc accepts -g
-configure:3058: gcc -c -g conftest.c >&5
+configure:3028: checking whether i586-mingw32msvc-gcc accepts -g
+configure:3058: i586-mingw32msvc-gcc -c -g -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
configure:3064: $? = 0
configure:3163: result: yes
-configure:3180: checking for gcc option to accept ISO C89
-configure:3254: gcc -c -g -O2 conftest.c >&5
+configure:3180: checking for i586-mingw32msvc-gcc option to accept ISO C89
+configure:3254: i586-mingw32msvc-gcc -c -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
configure:3260: $? = 0
configure:3283: result: none needed
configure:3312: checking for style of include used by make
configure:3340: result: GNU
-configure:3365: checking dependency style of gcc
+configure:3365: checking dependency style of i586-mingw32msvc-gcc
configure:3456: result: gcc3
configure:3484: checking for a BSD-compatible install
configure:3540: result: /usr/bin/install -c
@@ -120,376 +125,159 @@
configure:3668: found /usr/bin/sdl-config
configure:3681: result: /usr/bin/sdl-config
configure:3690: checking for SDL - version >= 1.2.5
-configure:3785: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL >&5
-configure:3788: $? = 0
-configure:3794: ./conftest
-configure:3797: $? = 0
configure:3817: result: yes
configure:3913: checking for Mix_PlayMusic in -lSDL_mixer
-configure:3948: gcc -o conftest -g -O2 conftest.c -lSDL_mixer >&5
+configure:3948: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_mixer >&5
configure:3954: $? = 0
configure:3972: result: yes
configure:3988: checking for TTF_Init in -lSDL_ttf
-configure:4023: gcc -o conftest -g -O2 conftest.c -lSDL_ttf -lSDL_mixer >&5
+configure:4023: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_ttf -lSDL_mixer >&5
configure:4029: $? = 0
configure:4047: result: yes
-configure:4062: checking for SDLPango_Init in -lSDL_Pango
-configure:4097: gcc -o conftest -g -O2 conftest.c -lSDL_Pango -lSDL_ttf -lSDL_mixer >&5
-configure:4103: $? = 0
-configure:4121: result: yes
-configure:4136: checking for IMG_Load in -lSDL_image
-configure:4171: gcc -o conftest -g -O2 conftest.c -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer >&5
-configure:4177: $? = 0
-configure:4195: result: yes
-configure:4219: checking for native Win32
-configure:4229: result: no
-configure:4302: checking how to run the C preprocessor
-configure:4342: gcc -E conftest.c
-configure:4348: $? = 0
-configure:4379: gcc -E conftest.c
-conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
-configure:4385: $? = 1
+configure:4063: checking for IMG_Load in -lSDL_image
+configure:4098: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+configure:4104: $? = 0
+configure:4122: result: yes
+configure:4138: checking for SDLPango_Init in -lSDL_Pango
+configure:4173: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer >&5
+/usr/lib/gcc/i586-mingw32msvc/3.4.5/../../../../i586-mingw32msvc/bin/ld: cannot find -lSDL_Pango
+collect2: ld returned 1 exit status
+configure:4179: $? = 1
configure: failed program was:
| /* confdefs.h. */
| #define PACKAGE_NAME "tuxtype"
| #define PACKAGE_TARNAME "tuxtype"
-| #define PACKAGE_VERSION "1.5.9"
-| #define PACKAGE_STRING "tuxtype 1.5.9"
+| #define PACKAGE_VERSION "1.5.10"
+| #define PACKAGE_STRING "tuxtype 1.5.10"
| #define PACKAGE_BUGREPORT "tuxmath-devel at lists.sourceforge.net"
| #define PACKAGE "tuxtype"
-| #define VERSION "1.5.9"
+| #define VERSION "1.5.10"
| #define HAVE_LIBSDL_MIXER 1
| #define HAVE_LIBSDL_TTF 1
-| #define HAVE_LIBSDL_PANGO 1
| #define HAVE_LIBSDL_IMAGE 1
| /* end confdefs.h. */
-| #include <ac_nonexistent.h>
-configure:4418: result: gcc -E
-configure:4447: gcc -E conftest.c
-configure:4453: $? = 0
-configure:4484: gcc -E conftest.c
-conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
-configure:4490: $? = 1
-configure: failed program was:
-| /* confdefs.h. */
-| #define PACKAGE_NAME "tuxtype"
-| #define PACKAGE_TARNAME "tuxtype"
-| #define PACKAGE_VERSION "1.5.9"
-| #define PACKAGE_STRING "tuxtype 1.5.9"
-| #define PACKAGE_BUGREPORT "tuxmath-devel at lists.sourceforge.net"
-| #define PACKAGE "tuxtype"
-| #define VERSION "1.5.9"
-| #define HAVE_LIBSDL_MIXER 1
-| #define HAVE_LIBSDL_TTF 1
-| #define HAVE_LIBSDL_PANGO 1
-| #define HAVE_LIBSDL_IMAGE 1
-| /* end confdefs.h. */
-| #include <ac_nonexistent.h>
-configure:4528: checking for grep that handles long lines and -e
-configure:4602: result: /bin/grep
-configure:4607: checking for egrep
-configure:4685: result: /bin/grep -E
-configure:4690: checking for ANSI C header files
-configure:4720: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4726: $? = 0
-configure:4825: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer >&5
-configure:4828: $? = 0
-configure:4834: ./conftest
-configure:4837: $? = 0
-configure:4854: result: yes
-configure:4878: checking for sys/types.h
-configure:4899: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4905: $? = 0
-configure:4921: result: yes
-configure:4878: checking for sys/stat.h
-configure:4899: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4905: $? = 0
-configure:4921: result: yes
-configure:4878: checking for stdlib.h
-configure:4899: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4905: $? = 0
-configure:4921: result: yes
-configure:4878: checking for string.h
-configure:4899: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4905: $? = 0
-configure:4921: result: yes
-configure:4878: checking for memory.h
-configure:4899: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4905: $? = 0
-configure:4921: result: yes
-configure:4878: checking for strings.h
-configure:4899: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4905: $? = 0
-configure:4921: result: yes
-configure:4878: checking for inttypes.h
-configure:4899: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4905: $? = 0
-configure:4921: result: yes
-configure:4878: checking for stdint.h
-configure:4899: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4905: $? = 0
-configure:4921: result: yes
-configure:4878: checking for unistd.h
-configure:4899: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:4905: $? = 0
-configure:4921: result: yes
-configure:4939: checking for stdlib.h
-configure:4945: result: yes
-configure:4939: checking for string.h
-configure:4945: result: yes
-configure:5081: checking for an ANSI C-conforming const
-configure:5156: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:5162: $? = 0
-configure:5177: result: yes
-configure:5187: checking for inline
-configure:5213: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c >&5
-configure:5219: $? = 0
-configure:5237: result: inline
-configure:5266: checking for atexit
-configure:5322: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer >&5
-configure:5328: $? = 0
-configure:5346: result: yes
-configure:5266: checking for memset
-configure:5322: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer >&5
-conftest.c:50: warning: conflicting types for built-in function 'memset'
-configure:5328: $? = 0
-configure:5346: result: yes
-configure:5266: checking for strchr
-configure:5322: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer >&5
-conftest.c:51: warning: conflicting types for built-in function 'strchr'
-configure:5328: $? = 0
-configure:5346: result: yes
-configure:5266: checking for strstr
-configure:5322: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer >&5
-conftest.c:52: warning: conflicting types for built-in function 'strstr'
-configure:5328: $? = 0
-configure:5346: result: yes
-configure:5266: checking for malloc
-configure:5322: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT conftest.c -L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer >&5
-conftest.c:53: warning: conflicting types for built-in function 'malloc'
-configure:5328: $? = 0
-configure:5346: result: yes
-configure:5398: checking for makensis
-configure:5429: result: no
-configure:5570: creating ./config.status
+|
+| /* Override any GCC internal prototype to avoid an error.
+| Use char because int might match the return type of a GCC
+| builtin and then its argument prototype would still apply. */
+| #ifdef __cplusplus
+| extern "C"
+| #endif
+| char SDLPango_Init ();
+| int
+| main ()
+| {
+| return SDLPango_Init ();
+| ;
+| return 0;
+| }
+configure:4197: result: no
+configure:4207: error: SDL_pango not found http://sdlpango.sourceforge.net/
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by tuxtype config.status 1.5.9, which was
-generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES =
- CONFIG_HEADERS =
- CONFIG_LINKS =
- CONFIG_COMMANDS =
- $ ./config.status
-
-on stallman
-
-config.status:738: creating Makefile
-config.status:738: creating tuxtype/Makefile
-config.status:738: creating tuxtype/data/Makefile
-config.status:738: creating tuxtype/data/fonts/Makefile
-config.status:738: creating tuxtype/data/images/Makefile
-config.status:738: creating tuxtype/data/images/backgrounds/Makefile
-config.status:738: creating tuxtype/data/images/cities/Makefile
-config.status:738: creating tuxtype/data/images/comets/Makefile
-config.status:738: creating tuxtype/data/images/hands/Makefile
-config.status:738: creating tuxtype/data/images/keyboard/Makefile
-config.status:738: creating tuxtype/data/images/menu/Makefile
-config.status:738: creating tuxtype/data/images/status/Makefile
-config.status:738: creating tuxtype/data/images/tux/Makefile
-config.status:738: creating tuxtype/data/scripts/Makefile
-config.status:738: creating tuxtype/data/sounds/Makefile
-config.status:738: creating tuxtype/data/themes/Makefile
-config.status:738: creating tuxtype/data/themes/armenian/Makefile
-config.status:738: creating tuxtype/data/themes/armenian/images/Makefile
-config.status:738: creating tuxtype/data/themes/bokmal/Makefile
-config.status:738: creating tuxtype/data/themes/bokmal/words/Makefile
-config.status:738: creating tuxtype/data/themes/bokmal/images/Makefile
-config.status:738: creating tuxtype/data/themes/bokmal/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/brazilian-portuguese/Makefile
-config.status:738: creating tuxtype/data/themes/brazilian-portuguese/images/Makefile
-config.status:738: creating tuxtype/data/themes/brazilian-portuguese/words/Makefile
-config.status:738: creating tuxtype/data/themes/catalan/Makefile
-config.status:738: creating tuxtype/data/themes/catalan/words/Makefile
-config.status:738: creating tuxtype/data/themes/dansk/Makefile
-config.status:738: creating tuxtype/data/themes/dansk/sounds/Makefile
-config.status:738: creating tuxtype/data/themes/dansk/words/Makefile
-config.status:738: creating tuxtype/data/themes/deutsch/Makefile
-config.status:738: creating tuxtype/data/themes/deutsch/words/Makefile
-config.status:738: creating tuxtype/data/themes/espanol/Makefile
-config.status:738: creating tuxtype/data/themes/espanol/images/Makefile
-config.status:738: creating tuxtype/data/themes/espanol/words/Makefile
-config.status:738: creating tuxtype/data/themes/euskara/Makefile
-config.status:738: creating tuxtype/data/themes/euskara/images/Makefile
-config.status:738: creating tuxtype/data/themes/euskara/words/Makefile
-config.status:738: creating tuxtype/data/themes/french/Makefile
-config.status:738: creating tuxtype/data/themes/french/words/Makefile
-config.status:738: creating tuxtype/data/themes/greek/Makefile
-config.status:738: creating tuxtype/data/themes/greek/words/Makefile
-config.status:738: creating tuxtype/data/themes/italian/Makefile
-config.status:738: creating tuxtype/data/themes/italian/words/Makefile
-config.status:738: creating tuxtype/data/themes/jamaican/Makefile
-config.status:738: creating tuxtype/data/themes/jamaican/images/Makefile
-config.status:738: creating tuxtype/data/themes/jamaican/words/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/images/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/sounds/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/words/Makefile
-config.status:738: creating tuxtype/data/themes/nederlands/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/images/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/words/Makefile
-config.status:738: creating tuxtype/data/themes/nederlands/words/Makefile
-config.status:738: creating tuxtype/data/themes/nynorsk/Makefile
-config.status:738: creating tuxtype/data/themes/nynorsk/images/Makefile
-config.status:738: creating tuxtype/data/themes/nynorsk/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/nynorsk/words/Makefile
-config.status:738: creating tuxtype/data/themes/russian/Makefile
-config.status:738: creating tuxtype/data/themes/russian/images/Makefile
-config.status:738: creating tuxtype/data/themes/russian/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/russian/words/Makefile
-config.status:738: creating tuxtype/data/themes/svenska/Makefile
-config.status:738: creating tuxtype/data/themes/svenska/words/Makefile
-config.status:738: creating tuxtype/data/themes/swahili/Makefile
-config.status:738: creating tuxtype/data/themes/swahili/words/Makefile
-config.status:738: creating tuxtype/data/words/Makefile
-config.status:738: creating tuxtype/docs/Makefile
-config.status:738: creating tuxtype/docs/en/Makefile
-config.status:738: creating tuxtype.spec
-config.status:738: creating nsis/tuxtype.nsi
-config.status:738: creating config.h
-config.status:975: config.h is unchanged
-config.status:1021: executing depfiles commands
-
## ---------------- ##
## Cache variables. ##
## ---------------- ##
-ac_cv_build=x86_64-unknown-linux-gnu
+ac_cv_build=i386-pc-linux-gnu
ac_cv_c_compiler_gnu=yes
-ac_cv_c_const=yes
-ac_cv_c_inline=inline
ac_cv_env_CC_set=
ac_cv_env_CC_value=
ac_cv_env_CFLAGS_set=
ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
+ac_cv_env_CPPFLAGS_set=set
+ac_cv_env_CPPFLAGS_value=-I/usr/local/cross-tools/i586-mingw32msvc/include
ac_cv_env_CPP_set=
ac_cv_env_CPP_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
+ac_cv_env_LDFLAGS_set=set
+ac_cv_env_LDFLAGS_value=-L/usr/local/cross-tools/i586-mingw32msvc/lib
ac_cv_env_LIBS_set=
ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_func_atexit=yes
-ac_cv_func_malloc=yes
-ac_cv_func_memset=yes
-ac_cv_func_strchr=yes
-ac_cv_func_strstr=yes
-ac_cv_header_inttypes_h=yes
-ac_cv_header_memory_h=yes
-ac_cv_header_stdc=yes
-ac_cv_header_stdint_h=yes
-ac_cv_header_stdlib_h=yes
-ac_cv_header_string_h=yes
-ac_cv_header_strings_h=yes
-ac_cv_header_sys_stat_h=yes
-ac_cv_header_sys_types_h=yes
-ac_cv_header_unistd_h=yes
-ac_cv_host=x86_64-unknown-linux-gnu
-ac_cv_lib_SDLPango_Init=yes
+ac_cv_env_build_alias_set=set
+ac_cv_env_build_alias_value=i386-linux
+ac_cv_env_host_alias_set=set
+ac_cv_env_host_alias_value=i586-mingw32msvc
+ac_cv_env_target_alias_set=set
+ac_cv_env_target_alias_value=i586-mingw32msvc
+ac_cv_exeext=.exe
+ac_cv_host=i586-pc-mingw32msvc
+ac_cv_lib_SDL_Pango_SDLPango_Init=no
ac_cv_lib_SDL_image_IMG_Load=yes
ac_cv_lib_SDL_mixer_Mix_PlayMusic=yes
ac_cv_lib_SDL_ttf_TTF_Init=yes
ac_cv_objext=o
-ac_cv_path_EGREP='/bin/grep -E'
-ac_cv_path_GREP=/bin/grep
-ac_cv_path_NSIS=no
ac_cv_path_SDL_CONFIG=/usr/bin/sdl-config
ac_cv_path_install='/usr/bin/install -c'
ac_cv_path_mkdir=/bin/mkdir
-ac_cv_prog_AWK=gawk
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_ac_ct_CC=gcc
+ac_cv_prog_AWK=mawk
+ac_cv_prog_CC=i586-mingw32msvc-gcc
+ac_cv_prog_STRIP=i586-mingw32msvc-strip
ac_cv_prog_cc_c89=
ac_cv_prog_cc_g=yes
ac_cv_prog_make_make_set=yes
-ac_cv_target=x86_64-unknown-linux-gnu
+ac_cv_target=i586-pc-mingw32msvc
am_cv_CC_dependencies_compiler_type=gcc3
## ----------------- ##
## Output variables. ##
## ----------------- ##
-ACLOCAL='${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run aclocal-1.10'
+ACLOCAL='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10'
AMDEPBACKSLASH='\'
AMDEP_FALSE='#'
AMDEP_TRUE=''
-AMTAR='${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run tar'
-AUTOCONF='${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run automake-1.10'
-AWK='gawk'
+AMTAR='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar'
+AUTOCONF='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf'
+AUTOHEADER='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader'
+AUTOMAKE='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10'
+AWK='mawk'
BUILD_MINGW32_FALSE=''
-BUILD_MINGW32_TRUE='#'
-CC='gcc'
+BUILD_MINGW32_TRUE=''
+CC='i586-mingw32msvc-gcc'
CCDEPMODE='depmode=gcc3'
-CFLAGS='-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
-CPP='gcc -E'
-CPPFLAGS=' -DDATA_PREFIX=\"$(prefix)\"'
+CFLAGS='-g -O2'
+CPP=''
+CPPFLAGS='-I/usr/local/cross-tools/i586-mingw32msvc/include'
CYGPATH_W='echo'
-DEFS='-DHAVE_CONFIG_H'
+DEFS=''
DEPDIR='.deps'
ECHO_C=''
ECHO_N='-n'
ECHO_T=''
-EGREP='/bin/grep -E'
-EXEEXT=''
-GREP='/bin/grep'
+EGREP=''
+EXEEXT='.exe'
+GREP=''
INSTALL_DATA='${INSTALL} -m 644'
INSTALL_PROGRAM='${INSTALL}'
INSTALL_SCRIPT='${INSTALL}'
INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
-LDFLAGS=''
+LDFLAGS='-L/usr/local/cross-tools/i586-mingw32msvc/lib'
LIBOBJS=''
-LIBS='-L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer '
+LIBS='-lSDL_image -lSDL_ttf -lSDL_mixer '
LN_S='ln -s'
LTLIBOBJS=''
-MAKEINFO='${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run makeinfo'
-NSIS='no'
-NSI_BUILD_FALSE='#'
+MAKEINFO='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo'
+NSIS=''
+NSI_BUILD_FALSE=''
NSI_BUILD_TRUE=''
-NSI_DLL_DIR='/home/mobin/tuxtype_dll'
-NSI_INSTALL_DIR='mingw32'
+NSI_DLL_DIR=''
+NSI_INSTALL_DIR=''
OBJEXT='o'
PACKAGE='tuxtype'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
PACKAGE_NAME='tuxtype'
-PACKAGE_STRING='tuxtype 1.5.9'
+PACKAGE_STRING='tuxtype 1.5.10'
PACKAGE_TARNAME='tuxtype'
-PACKAGE_VERSION='1.5.9'
+PACKAGE_VERSION='1.5.10'
PATH_SEPARATOR=':'
SDL_CFLAGS='-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
SDL_CONFIG='/usr/bin/sdl-config'
SDL_LIBS='-L/usr/lib -lSDL'
SET_MAKE=''
SHELL='/bin/sh'
-STRIP=''
-VERSION='1.5.9'
+STRIP='i586-mingw32msvc-strip'
+VERSION='1.5.10'
WINDRES=''
-ac_ct_CC='gcc'
+ac_ct_CC=''
am__fastdepCC_FALSE='#'
am__fastdepCC_TRUE=''
am__include='include'
@@ -499,25 +287,25 @@
am__tar='${AMTAR} chof - "$$tardir"'
am__untar='${AMTAR} xf -'
bindir='${exec_prefix}/bin'
-build='x86_64-unknown-linux-gnu'
-build_alias=''
-build_cpu='x86_64'
+build='i386-pc-linux-gnu'
+build_alias='i386-linux'
+build_cpu='i386'
build_os='linux-gnu'
-build_vendor='unknown'
+build_vendor='pc'
datadir='${datarootdir}'
datarootdir='${prefix}/share'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
dvidir='${docdir}'
-exec_prefix='${prefix}'
-host='x86_64-unknown-linux-gnu'
-host_alias=''
-host_cpu='x86_64'
-host_os='linux-gnu'
-host_vendor='unknown'
+exec_prefix='NONE'
+host='i586-pc-mingw32msvc'
+host_alias='i586-mingw32msvc'
+host_cpu='i586'
+host_os='mingw32msvc'
+host_vendor='pc'
htmldir='${docdir}'
includedir='${prefix}/include'
infodir='${datarootdir}/info'
-install_sh='$(SHELL) /home/mobin/Desktop/tuxtype-indic/install-sh'
+install_sh='$(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh'
libdir='${exec_prefix}/lib'
libexecdir='${exec_prefix}/libexec'
localedir='${datarootdir}/locale'
@@ -526,17 +314,17 @@
mkdir_p='/bin/mkdir -p'
oldincludedir='/usr/include'
pdfdir='${docdir}'
-prefix='/usr/local'
-program_transform_name='s,x,x,'
+prefix='/usr/local/cross-tools/i586-mingw32msvc'
+program_transform_name='s&^&i586-mingw32msvc-&'
psdir='${docdir}'
sbindir='${exec_prefix}/sbin'
sharedstatedir='${prefix}/com'
sysconfdir='${prefix}/etc'
-target='x86_64-unknown-linux-gnu'
-target_alias=''
-target_cpu='x86_64'
-target_os='linux-gnu'
-target_vendor='unknown'
+target='i586-pc-mingw32msvc'
+target_alias='i586-mingw32msvc'
+target_cpu='i586'
+target_os='mingw32msvc'
+target_vendor='pc'
## ----------- ##
## confdefs.h. ##
@@ -544,31 +332,13 @@
#define PACKAGE_NAME "tuxtype"
#define PACKAGE_TARNAME "tuxtype"
-#define PACKAGE_VERSION "1.5.9"
-#define PACKAGE_STRING "tuxtype 1.5.9"
+#define PACKAGE_VERSION "1.5.10"
+#define PACKAGE_STRING "tuxtype 1.5.10"
#define PACKAGE_BUGREPORT "tuxmath-devel at lists.sourceforge.net"
#define PACKAGE "tuxtype"
-#define VERSION "1.5.9"
+#define VERSION "1.5.10"
#define HAVE_LIBSDL_MIXER 1
#define HAVE_LIBSDL_TTF 1
-#define HAVE_LIBSDL_PANGO 1
#define HAVE_LIBSDL_IMAGE 1
-#define STDC_HEADERS 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_ATEXIT 1
-#define HAVE_MEMSET 1
-#define HAVE_STRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_MALLOC 1
-configure: exit 0
+configure: exit 1
Modified: tuxtype/branches/tuxtype-indic/configure
===================================================================
--- tuxtype/branches/tuxtype-indic/configure 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/configure 2007-08-01 23:02:27 UTC (rev 193)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tuxtype 1.5.9.
+# Generated by GNU Autoconf 2.61 for tuxtype 1.5.10.
#
# Report bugs to <tuxmath-devel at lists.sourceforge.net>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='tuxtype'
PACKAGE_TARNAME='tuxtype'
-PACKAGE_VERSION='1.5.9'
-PACKAGE_STRING='tuxtype 1.5.9'
+PACKAGE_VERSION='1.5.10'
+PACKAGE_STRING='tuxtype 1.5.10'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
ac_unique_file="tuxtype/funcs.h"
@@ -1232,7 +1232,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures tuxtype 1.5.9 to adapt to many kinds of systems.
+\`configure' configures tuxtype 1.5.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1303,7 +1303,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tuxtype 1.5.9:";;
+ short | recursive ) echo "Configuration of tuxtype 1.5.10:";;
esac
cat <<\_ACEOF
@@ -1397,7 +1397,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tuxtype configure 1.5.9
+tuxtype configure 1.5.10
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1411,7 +1411,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tuxtype $as_me 1.5.9, which was
+It was created by tuxtype $as_me 1.5.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2229,7 +2229,7 @@
# Define the identity of the package.
PACKAGE=tuxtype
- VERSION=1.5.9
+ VERSION=1.5.10
cat >>confdefs.h <<_ACEOF
@@ -4059,13 +4059,14 @@
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: checking for SDLPango_Init in -lSDL_Pango" >&5
-echo $ECHO_N "checking for SDLPango_Init in -lSDL_Pango... $ECHO_C" >&6; }
-if test "${ac_cv_lib_SDLPango_Init+set}" = set; then
+
+{ echo "$as_me:$LINENO: checking for IMG_Load in -lSDL_image" >&5
+echo $ECHO_N "checking for IMG_Load in -lSDL_image... $ECHO_C" >&6; }
+if test "${ac_cv_lib_SDL_image_IMG_Load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL_Pango $LIBS"
+LIBS="-lSDL_image $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4079,11 +4080,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char SDLPango_Init ();
+char IMG_Load ();
int
main ()
{
-return SDLPango_Init ();
+return IMG_Load ();
;
return 0;
}
@@ -4106,40 +4107,41 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_SDLPango_Init=yes
+ ac_cv_lib_SDL_image_IMG_Load=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_SDLPango_Init=no
+ ac_cv_lib_SDL_image_IMG_Load=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDLPango_Init" >&5
-echo "${ECHO_T}$ac_cv_lib_SDLPango_Init" >&6; }
-if test $ac_cv_lib_SDLPango_Init = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
+echo "${ECHO_T}$ac_cv_lib_SDL_image_IMG_Load" >&6; }
+if test $ac_cv_lib_SDL_image_IMG_Load = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSDLPANGO 1
+#define HAVE_LIBSDL_IMAGE 1
_ACEOF
- LIBS="-lSDL_Pango $LIBS"
+ LIBS="-lSDL_image $LIBS"
else
- { { echo "$as_me:$LINENO: error: libsdl-pango1 not found http://packages.debian.org/stable/libs/libsdl-pango1" >&5
-echo "$as_me: error: libsdl-pango1 not found http://packages.debian.org/stable/libs/libsdl-pango1" >&2;}
+ { { echo "$as_me:$LINENO: error: SDL_image not found http://www.libsdl.org/projects/SDL_image" >&5
+echo "$as_me: error: SDL_image not found http://www.libsdl.org/projects/SDL_image" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: checking for IMG_Load in -lSDL_image" >&5
-echo $ECHO_N "checking for IMG_Load in -lSDL_image... $ECHO_C" >&6; }
-if test "${ac_cv_lib_SDL_image_IMG_Load+set}" = set; then
+
+{ echo "$as_me:$LINENO: checking for SDLPango_Init in -lSDL_Pango" >&5
+echo $ECHO_N "checking for SDLPango_Init in -lSDL_Pango... $ECHO_C" >&6; }
+if test "${ac_cv_lib_SDL_Pango_SDLPango_Init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL_image $LIBS"
+LIBS="-lSDL_Pango $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4153,11 +4155,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char IMG_Load ();
+char SDLPango_Init ();
int
main ()
{
-return IMG_Load ();
+return SDLPango_Init ();
;
return 0;
}
@@ -4180,34 +4182,33 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_SDL_image_IMG_Load=yes
+ ac_cv_lib_SDL_Pango_SDLPango_Init=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_SDL_image_IMG_Load=no
+ ac_cv_lib_SDL_Pango_SDLPango_Init=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
-echo "${ECHO_T}$ac_cv_lib_SDL_image_IMG_Load" >&6; }
-if test $ac_cv_lib_SDL_image_IMG_Load = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_Pango_SDLPango_Init" >&5
+echo "${ECHO_T}$ac_cv_lib_SDL_Pango_SDLPango_Init" >&6; }
+if test $ac_cv_lib_SDL_Pango_SDLPango_Init = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSDL_IMAGE 1
+#define HAVE_LIBSDL_PANGO 1
_ACEOF
- LIBS="-lSDL_image $LIBS"
+ LIBS="-lSDL_Pango $LIBS"
else
- { { echo "$as_me:$LINENO: error: SDL_image not found http://www.libsdl.org/projects/SDL_image" >&5
-echo "$as_me: error: SDL_image not found http://www.libsdl.org/projects/SDL_image" >&2;}
+ { { echo "$as_me:$LINENO: error: SDL_Pango not found http://sdlpango.sourceforge.net/" >&5
+echo "$as_me: error: SDL_Pango not found http://sdlpango.sourceforge.net/" >&2;}
{ (exit 1); exit 1; }; }
fi
-
#
SDL_CFLAGS=`sdl-config --cflags`
CFLAGS="$CFLAGS $SDL_CFLAGS"
@@ -5361,7 +5362,7 @@
# Sam's Install Kludge-work
CPPFLAGS="$CPPFLAGS -DDATA_PREFIX=\\\"\$(prefix)\\\""
-ac_config_files="$ac_config_files Makefile tuxtype/Makefile tuxtype/data/Makefile tuxtype/data/fonts/Makefile tuxtype/data/images/Makefile tuxtype/data/images/backgrounds/Makefile tuxtype/data/images/cities/Makefile tuxtype/data/images/comets/Makefile tuxtype/data/images/hands/Makefile tuxtype/data/images/keyboard/Makefile tuxtype/data/images/menu/Makefile tuxtype/data/images/status/Makefile tuxtype/data/images/tux/Makefile tuxtype/data/scripts/Makefile tuxtype/data/sounds/Makefile tuxtype/data/themes/Makefile tuxtype/data/themes/armenian/Makefile tuxtype/data/themes/armenian/images/Makefile tuxtype/data/themes/bokmal/Makefile tuxtype/data/themes/bokmal/words/Makefile tuxtype/data/themes/bokmal/images/Makefile tuxtype/data/themes/bokmal/images/status/Makefile tuxtype/data/themes/brazilian-portuguese/Makefile tuxtype/data/themes/brazilian-portuguese/images/Makefile tuxtype/data/themes/brazilian-portuguese/words/Makefile tuxtype/data/themes/catalan/Makefile tuxtype/data/themes/catalan/words/Makefile tuxtype/data/themes/dansk/Makefile tuxtype/data/themes/dansk/sounds/Makefile tuxtype/data/themes/dansk/words/Makefile tuxtype/data/themes/deutsch/Makefile tuxtype/data/themes/deutsch/words/Makefile tuxtype/data/themes/espanol/Makefile tuxtype/data/themes/espanol/images/Makefile tuxtype/data/themes/espanol/words/Makefile tuxtype/data/themes/euskara/Makefile tuxtype/data/themes/euskara/images/Makefile tuxtype/data/themes/euskara/words/Makefile tuxtype/data/themes/french/Makefile tuxtype/data/themes/french/words/Makefile tuxtype/data/themes/greek/Makefile tuxtype/data/themes/greek/words/Makefile tuxtype/data/themes/italian/Makefile tuxtype/data/themes/italian/words/Makefile tuxtype/data/themes/jamaican/Makefile tuxtype/data/themes/jamaican/images/Makefile tuxtype/data/themes/jamaican/words/Makefile tuxtype/data/themes/lithuanian/Makefile tuxtype/data/themes/lithuanian/images/Makefile tuxtype/data/themes/lithuanian/images/status/Makefile tuxtype/data/themes/lithuanian/sounds/Makefile tuxtype/data/themes/lithuanian/words/Makefile tuxtype/data/themes/nederlands/Makefile tuxtype/data/themes/malayalam/Makefile tuxtype/data/themes/malayalam/images/Makefile tuxtype/data/themes/malayalam/images/status/Makefile tuxtype/data/themes/malayalam/words/Makefile tuxtype/data/themes/nederlands/words/Makefile tuxtype/data/themes/nynorsk/Makefile tuxtype/data/themes/nynorsk/images/Makefile tuxtype/data/themes/nynorsk/images/status/Makefile tuxtype/data/themes/nynorsk/words/Makefile tuxtype/data/themes/russian/Makefile tuxtype/data/themes/russian/images/Makefile tuxtype/data/themes/russian/images/status/Makefile tuxtype/data/themes/russian/words/Makefile tuxtype/data/themes/svenska/Makefile tuxtype/data/themes/svenska/words/Makefile tuxtype/data/themes/swahili/Makefile tuxtype/data/themes/swahili/words/Makefile tuxtype/data/words/Makefile tuxtype/docs/Makefile tuxtype/docs/en/Makefile tuxtype.spec"
+ac_config_files="$ac_config_files Makefile tuxtype/Makefile tuxtype/data/Makefile tuxtype/data/fonts/Makefile tuxtype/data/images/Makefile tuxtype/data/images/backgrounds/Makefile tuxtype/data/images/cities/Makefile tuxtype/data/images/comets/Makefile tuxtype/data/images/hands/Makefile tuxtype/data/images/keyboard/Makefile tuxtype/data/images/menu/Makefile tuxtype/data/images/status/Makefile tuxtype/data/images/tux/Makefile tuxtype/data/scripts/Makefile tuxtype/data/sounds/Makefile tuxtype/data/themes/Makefile tuxtype/data/themes/armenian/Makefile tuxtype/data/themes/armenian/images/Makefile tuxtype/data/themes/bokmal/Makefile tuxtype/data/themes/bokmal/words/Makefile tuxtype/data/themes/bokmal/images/Makefile tuxtype/data/themes/bokmal/images/status/Makefile tuxtype/data/themes/brazilian-portuguese/Makefile tuxtype/data/themes/brazilian-portuguese/images/Makefile tuxtype/data/themes/brazilian-portuguese/words/Makefile tuxtype/data/themes/catalan/Makefile tuxtype/data/themes/catalan/words/Makefile tuxtype/data/themes/dansk/Makefile tuxtype/data/themes/dansk/sounds/Makefile tuxtype/data/themes/dansk/words/Makefile tuxtype/data/themes/deutsch/Makefile tuxtype/data/themes/deutsch/words/Makefile tuxtype/data/themes/espanol/Makefile tuxtype/data/themes/espanol/images/Makefile tuxtype/data/themes/espanol/words/Makefile tuxtype/data/themes/euskara/Makefile tuxtype/data/themes/euskara/images/Makefile tuxtype/data/themes/euskara/words/Makefile tuxtype/data/themes/french/Makefile tuxtype/data/themes/french/words/Makefile tuxtype/data/themes/greek/Makefile tuxtype/data/themes/greek/words/Makefile tuxtype/data/themes/italian/Makefile tuxtype/data/themes/italian/words/Makefile tuxtype/data/themes/jamaican/Makefile tuxtype/data/themes/jamaican/images/Makefile tuxtype/data/themes/jamaican/words/Makefile tuxtype/data/themes/lithuanian/Makefile tuxtype/data/themes/lithuanian/images/Makefile tuxtype/data/themes/lithuanian/images/status/Makefile tuxtype/data/themes/lithuanian/sounds/Makefile tuxtype/data/themes/lithuanian/words/Makefile tuxtype/data/themes/malayalam/Makefile tuxtype/data/themes/malayalam/images/Makefile tuxtype/data/themes/malayalam/images/status/Makefile tuxtype/data/themes/malayalam/words/Makefile tuxtype/data/themes/nederlands/Makefile tuxtype/data/themes/nederlands/words/Makefile tuxtype/data/themes/nynorsk/Makefile tuxtype/data/themes/nynorsk/images/Makefile tuxtype/data/themes/nynorsk/images/status/Makefile tuxtype/data/themes/nynorsk/words/Makefile tuxtype/data/themes/russian/Makefile tuxtype/data/themes/russian/images/Makefile tuxtype/data/themes/russian/images/status/Makefile tuxtype/data/themes/russian/words/Makefile tuxtype/data/themes/svenska/Makefile tuxtype/data/themes/svenska/words/Makefile tuxtype/data/themes/swahili/Makefile tuxtype/data/themes/swahili/words/Makefile tuxtype/data/words/Makefile tuxtype/docs/Makefile tuxtype/docs/en/Makefile tuxtype.spec"
# Support for building NSIS Win32 installer (adapted from TuxMath NSIS):
@@ -5863,7 +5864,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tuxtype $as_me 1.5.9, which was
+This file was extended by tuxtype $as_me 1.5.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5916,7 +5917,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-tuxtype config.status 1.5.9
+tuxtype config.status 1.5.10
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -6084,12 +6085,10 @@
"tuxtype/data/themes/lithuanian/images/status/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/images/status/Makefile" ;;
"tuxtype/data/themes/lithuanian/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/sounds/Makefile" ;;
"tuxtype/data/themes/lithuanian/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/lithuanian/words/Makefile" ;;
-
"tuxtype/data/themes/malayalam/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/Makefile" ;;
"tuxtype/data/themes/malayalam/images/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/Makefile" ;;
"tuxtype/data/themes/malayalam/images/status/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/images/status/Makefile" ;;
"tuxtype/data/themes/malayalam/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/malayalam/words/Makefile" ;;
-
"tuxtype/data/themes/nederlands/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nederlands/Makefile" ;;
"tuxtype/data/themes/nederlands/words/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nederlands/words/Makefile" ;;
"tuxtype/data/themes/nynorsk/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/data/themes/nynorsk/Makefile" ;;
Modified: tuxtype/branches/tuxtype-indic/configure.ac
===================================================================
--- tuxtype/branches/tuxtype-indic/configure.ac 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/configure.ac 2007-08-01 23:02:27 UTC (rev 193)
@@ -36,7 +36,7 @@
AC_CHECK_LIB([SDL_mixer], [Mix_PlayMusic], ,[AC_MSG_ERROR(SDL_mixer not found http://www.libsdl.org/projects/SDL_mixer, )])
AC_CHECK_LIB([SDL_ttf], [TTF_Init], ,[AC_MSG_ERROR(SDL_ttf not found http://www.libsdl.org/projects/SDL_ttf, )])
AC_CHECK_LIB([SDL_image], [IMG_Load], ,[AC_MSG_ERROR(SDL_image not found http://www.libsdl.org/projects/SDL_image, )])
-
+AC_CHECK_LIB([SDL_Pango], [SDLPango_Init], ,[AC_MSG_ERROR(SDL_Pango not found http://sdlpango.sourceforge.net/, )])
#
SDL_CFLAGS=`sdl-config --cflags`
CFLAGS="$CFLAGS $SDL_CFLAGS"
Modified: tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/alphabet.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -382,63 +382,72 @@
*/
void UseAlphabet(void)
{
- int i,l;
- char fn[256];
- wchar_t wide_str[255];
+ int i, l;
+ char fn[256];
+ wchar_t wide_str[255];
- LOG("Entering UseAlphabet()\n");
+ LOG("Entering UseAlphabet()\n");
- num_words = 0;
- /* This totally mucks up i18n abilities :( */
-/* for (i=65; i<90; i++)
- {
- if (ALPHABET[i]) {
- word_list[num_words][0] = (unsigned char)i;
- word_list[num_words][1] = '\0';
- num_words++;
+ num_words = 0;
- DEBUGCODE { fprintf(stderr, "Adding %c\n", (unsigned char)i); }
- }
- }*/
+ /* Read the characters from Keyboard.lst file to get i18n abilities*/
+ for (l = useEnglish; l < 2; l++)
+ {
+ sprintf(fn , "%s/keyboard.lst", realPath[l]);
- /* Read the characters from Keyboard.lst file to get i18n abilities*/
- for (l=useEnglish; l<2; l++) {
- sprintf( fn , "%s/keyboard.lst", realPath[l]);
- if ( CheckFile(fn) ) {
- unsigned char str[255];
- FILE *f;
- int i,j;
- f = fopen( fn, "r" );
- if (f == NULL)
- continue;
- do {
- fscanf( f, "%[^\n]\n", str);
- for (j = 0; j < strlen(str); j++)
- {
- if (str[j] == '\n' || str[j] == '\r')
- str[j] = '\0';
- }
- if (strlen(str) > 3) {
- /* format is: FINGER(s)|Char(s) Upper/Lower */
- /* advance past the fingers */
- for (i=0; i<strlen(str) && str[i] != '|'; i++);
- i++; // pass the '|'
- convert_from_UTF8(word_list[num_words], str+i);
- word_list[num_words][1]='\0';
- num_words++;
- }
- } while (!feof(f));
- break;
- }
- }
- /* Make sure list is terminated with null character */
- word_list[num_words][0] = '\0';
+ if (CheckFile(fn))
+ {
+ unsigned char str[255];
+ FILE* f;
+ int i, j;
- /* Make list of all unicode characters used in word list: */
- gen_char_list();
+ f = fopen(fn, "r");
+
+ if (f == NULL)
+ {
+ continue;
+ }
- DOUT(num_words);
- LOG("Leaving UseAlphabet()\n");
+ do
+ {
+ fscanf(f, "%[^\n]\n", str);
+
+ for (j = 0; j < strlen(str); j++)
+ {
+ if (str[j] == '\n' || str[j] == '\r')
+ str[j] = '\0';
+ }
+
+ if (strlen(str) > 3)
+ {
+ /* format is: FINGER(s)|Char(s) Upper/Lower */
+ /* advance past the fingers */
+ for (i=0; i<strlen(str) && str[i] != '|'; i++);
+ i++; // pass the '|'
+ convert_from_UTF8(word_list[num_words], str + i);
+ word_list[num_words][1]='\0';
+ num_words++;
+ }
+
+ } while (!feof(f));
+
+ break;
+ }
+ else /* Could not find Keyboard.lst file! */
+ {
+ LOG("Could not find Keyboard.lst file! - leaving UseAlphabet()\n");
+ return;
+ }
+ }
+
+ /* Make sure list is terminated with null character */
+ word_list[num_words][0] = '\0';
+
+ /* Make list of all unicode characters used in word list: */
+ gen_char_list();
+
+ DOUT(num_words);
+ LOG("Leaving UseAlphabet()\n");
}
/* GetWord: returns a random word that wasn't returned
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -236,9 +236,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/backgrounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/backgrounds/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/backgrounds/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -168,9 +168,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/backgrounds/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/images/backgrounds/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/backgrounds/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/images/backgrounds/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/cities/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/cities/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/cities/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -195,9 +195,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/cities/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/images/cities/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/cities/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/images/cities/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/comets/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/comets/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/comets/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -167,9 +167,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/comets/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/images/comets/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/comets/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/images/comets/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -173,9 +173,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/hands/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/images/hands/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/hands/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/images/hands/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/keyboard/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/keyboard/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/keyboard/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -170,9 +170,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/keyboard/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/images/keyboard/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/keyboard/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/images/keyboard/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/menu/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/menu/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/menu/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -227,9 +227,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/menu/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/images/menu/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/menu/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/images/menu/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/status/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/status/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -169,9 +169,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/status/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/images/status/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/status/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/images/status/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/tux/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/tux/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/tux/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -197,9 +197,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/tux/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/images/tux/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/tux/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/images/tux/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/scripts/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/scripts/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/scripts/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/scripts/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/sounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/sounds/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/sounds/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -188,9 +188,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/sounds/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/sounds/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/sounds/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/sounds/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -177,9 +177,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/armenian/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/armenian/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/armenian/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/armenian/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/armenian/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/armenian/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/armenian/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/armenian/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/bokmal/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/bokmal/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/bokmal/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/bokmal/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/images/status/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/bokmal/images/status/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/images/status/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/bokmal/images/status/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -171,9 +171,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/bokmal/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/bokmal/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/brazilian-portuguese/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/brazilian-portuguese/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/brazilian-portuguese/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/brazilian-portuguese/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/brazilian-portuguese/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/brazilian-portuguese/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/brazilian-portuguese/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/brazilian-portuguese/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -167,9 +167,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/brazilian-portuguese/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/brazilian-portuguese/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/brazilian-portuguese/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/brazilian-portuguese/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -178,9 +178,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/catalan/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/catalan/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/catalan/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/catalan/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -167,9 +167,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/catalan/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/catalan/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/catalan/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/catalan/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -178,9 +178,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/dansk/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/dansk/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/dansk/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/dansk/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/dansk/sounds/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/dansk/sounds/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/dansk/sounds/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/dansk/sounds/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -166,9 +166,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/dansk/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/dansk/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/dansk/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/dansk/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/deutsch/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/deutsch/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/deutsch/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/deutsch/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -168,9 +168,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/deutsch/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/deutsch/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/deutsch/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/deutsch/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/espanol/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/espanol/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/espanol/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/espanol/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/espanol/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/espanol/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/espanol/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/espanol/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/espanol/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/espanol/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/espanol/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/espanol/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/euskara/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/euskara/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/euskara/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/euskara/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/euskara/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/euskara/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/euskara/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/euskara/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/euskara/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/euskara/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/euskara/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/euskara/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/french/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/french/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/french/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/french/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -168,9 +168,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/french/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/french/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/french/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/french/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -177,9 +177,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/greek/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/greek/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/greek/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/greek/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/greek/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/greek/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/greek/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/greek/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/italian/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/italian/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/italian/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/italian/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/italian/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/italian/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/italian/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/italian/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -174,9 +174,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/jamaican/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/jamaican/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/jamaican/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/jamaican/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -168,9 +168,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/jamaican/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/jamaican/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/jamaican/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/jamaican/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/jamaican/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/jamaican/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/jamaican/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/jamaican/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -178,9 +178,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -174,9 +174,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/images/status/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/images/status/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/images/status/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/images/status/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/sounds/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/sounds/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/sounds/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/sounds/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -169,9 +169,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/lithuanian/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/lithuanian/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -177,9 +177,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/malayalam/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/malayalam/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/malayalam/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/malayalam/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/malayalam/images/status/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/malayalam/images/status/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/malayalam/images/status/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/malayalam/images/status/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/nederlands/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/nederlands/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/nederlands/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/nederlands/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -168,9 +168,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/nederlands/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/nederlands/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/nederlands/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/nederlands/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/nynorsk/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/nynorsk/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/nynorsk/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/nynorsk/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/nynorsk/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/nynorsk/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/nynorsk/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/nynorsk/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/nynorsk/images/status/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/nynorsk/images/status/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/nynorsk/images/status/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/nynorsk/images/status/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -171,9 +171,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/nynorsk/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/nynorsk/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/nynorsk/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/nynorsk/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -178,9 +178,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/russian/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/russian/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/russian/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/russian/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -177,9 +177,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/russian/images/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/russian/images/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/russian/images/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/russian/images/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/status/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/status/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/russian/images/status/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/russian/images/status/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/russian/images/status/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/russian/images/status/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/russian/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/russian/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/russian/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/russian/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -178,9 +178,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/svenska/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/svenska/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/svenska/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/svenska/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,9 +165,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/svenska/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/svenska/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/svenska/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/svenska/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -175,9 +175,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/swahili/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/swahili/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/swahili/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/swahili/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/swahili/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/themes/swahili/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/swahili/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/themes/swahili/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/words/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/words/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -168,9 +168,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/words/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/data/words/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/words/Makefile
+ $(AUTOMAKE) --foreign tuxtype/data/words/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/docs/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/docs/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/docs/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -174,9 +174,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/docs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/docs/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/docs/Makefile
+ $(AUTOMAKE) --foreign tuxtype/docs/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/docs/en/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/docs/en/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/docs/en/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -162,9 +162,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/docs/en/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tuxtype/docs/en/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/docs/en/Makefile
+ $(AUTOMAKE) --foreign tuxtype/docs/en/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: tuxtype/branches/tuxtype-indic/tuxtype/globals.h
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/globals.h 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/globals.h 2007-08-01 23:02:27 UTC (rev 193)
@@ -165,7 +165,7 @@
extern SDL_Color yellow;
extern SDL_Surface *bkg;
-extern SDL_Surface *letters[255];
+extern SDL_Surface *letters[255]; //FIXME get rid of this - use GetWhiteGlyph(), etc instead
extern wchar_t ALPHABET[256];
Modified: tuxtype/branches/tuxtype-indic/tuxtype/main.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/main.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/main.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -42,7 +42,7 @@
speed_up = 0; //run at normal speed
show_tux4kids = 1; //show tux4kids logo the first time in main menu
useEnglish = 1; //default to no theme
- debugOn = 0; //default to not in debug mode
+ debugOn = 1; //default to not in debug mode
hidden = 0; //default to no "hidden" background
Modified: tuxtype/branches/tuxtype-indic/tuxtype/practice.c
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/practice.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/branches/tuxtype-indic/tuxtype/practice.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -41,8 +41,8 @@
/* */
/************************************************************************/
+/* FIXME this file is not Unicode-compliant */
-
int Phrases(char* pphrase ) {
/* TODO
@@ -209,12 +209,21 @@
wrong = LoadSound("tock.wav");
let[1]=0;
+
for (i=1; i<255; i++)
- if (ALPHABET[i]) {
+ {
+ if (ALPHABET[i])
+ {
+ LOG("letter in ALPHABET[]\n");
let[0]=i;
letters[i] = BlackOutline(let, font, &white);
}
-
+ else
+ {
+ LOG("letter NOT in ALPHABET[]\n");
+ letters[i] = NULL;
+ }
+ }
LOG("DONE - Loading practice media\n");
TTF_CloseFont(font);
@@ -293,8 +302,9 @@
//Calculate and record pixel width of phrases
for (c=0;c<=pc;c++){
for(i=0; i<strlen(phrase[c]); i++){
- if (letters[(int)phrase[c][i]] == NULL)
- printf("no letter defined in keyboard.lst\n");
+ if (letters[(int)phrase[c][i]] == NULL){
+ LOG("no letter defined in keyboard.lst\n");
+ }
else
pw[c]+= letters[(int)phrase[c][i]]->w-5;
}
@@ -310,7 +320,8 @@
}else{
z=0;
wp=0;
- for (i=0;i<strlen(phrase[c]);i++){
+ for (i=0;i<strlen(phrase[c]);i++)
+ {
z += letters[(int)phrase[c][i]]->w-5;
if (wp == 0 && z > 598){
wp = i-1;
@@ -328,6 +339,7 @@
}
}
}
+ LOG("Leaving get_phrase()\n");
return(wp);
}
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/ChangeLog 2007-08-01 23:02:27 UTC (rev 193)
@@ -1,3 +1,9 @@
+01 Aug 2007
+[ David Bruce ]
+ - Removed KEYMAP array - wasn't being used correctly anyway.
+ - Consolidated many global vars into settings struct.
+ - code cleanup.
+
v 1.5.10 - 16 Jun 2007
[ David Bruce ]
- Added ConvertUTF.c & .h from Unicode, Inc. to do UTF-8 to wcs
Modified: tuxtype/trunk/configure
===================================================================
--- tuxtype/trunk/configure 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/configure 2007-08-01 23:02:27 UTC (rev 193)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tuxtype 1.5.9.
+# Generated by GNU Autoconf 2.61 for tuxtype 1.5.10.
#
# Report bugs to <tuxmath-devel at lists.sourceforge.net>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='tuxtype'
PACKAGE_TARNAME='tuxtype'
-PACKAGE_VERSION='1.5.9'
-PACKAGE_STRING='tuxtype 1.5.9'
+PACKAGE_VERSION='1.5.10'
+PACKAGE_STRING='tuxtype 1.5.10'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
ac_unique_file="tuxtype/funcs.h"
@@ -1232,7 +1232,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures tuxtype 1.5.9 to adapt to many kinds of systems.
+\`configure' configures tuxtype 1.5.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1303,7 +1303,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tuxtype 1.5.9:";;
+ short | recursive ) echo "Configuration of tuxtype 1.5.10:";;
esac
cat <<\_ACEOF
@@ -1397,7 +1397,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tuxtype configure 1.5.9
+tuxtype configure 1.5.10
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1411,7 +1411,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tuxtype $as_me 1.5.9, which was
+It was created by tuxtype $as_me 1.5.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2229,7 +2229,7 @@
# Define the identity of the package.
PACKAGE=tuxtype
- VERSION=1.5.9
+ VERSION=1.5.10
cat >>confdefs.h <<_ACEOF
@@ -5790,7 +5790,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tuxtype $as_me 1.5.9, which was
+This file was extended by tuxtype $as_me 1.5.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5843,7 +5843,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-tuxtype config.status 1.5.9
+tuxtype config.status 1.5.10
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: tuxtype/trunk/tuxtype/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.am 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/Makefile.am 2007-08-01 23:02:27 UTC (rev 193)
@@ -17,7 +17,8 @@
scripting.c \
scripting.h \
pause.c \
- ConvertUTF.c
+ ConvertUTF.c \
+ options.c
SUBDIRS = \
data \
@@ -47,6 +48,8 @@
snow.h \
pause.c \
ConvertUTF.c \
- ConvertUTF.h
+ ConvertUTF.h \
+ options.c
+
Modified: tuxtype/trunk/tuxtype/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.in 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/Makefile.in 2007-08-01 23:02:27 UTC (rev 193)
@@ -52,7 +52,7 @@
laser.$(OBJEXT) alphabet.$(OBJEXT) theme.$(OBJEXT) \
practice.$(OBJEXT) audio.$(OBJEXT) gettext.$(OBJEXT) \
snow.$(OBJEXT) scripting.$(OBJEXT) pause.$(OBJEXT) \
- ConvertUTF.$(OBJEXT)
+ ConvertUTF.$(OBJEXT) options.$(OBJEXT)
tuxtype_OBJECTS = $(am_tuxtype_OBJECTS)
tuxtype_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
@@ -197,7 +197,8 @@
scripting.c \
scripting.h \
pause.c \
- ConvertUTF.c
+ ConvertUTF.c \
+ options.c
SUBDIRS = \
data \
@@ -227,7 +228,8 @@
snow.h \
pause.c \
ConvertUTF.c \
- ConvertUTF.h
+ ConvertUTF.h \
+ options.c
all: all-recursive
@@ -302,6 +304,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/laser.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/loaders.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/options.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pause.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/playgame.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/practice.Po at am__quote@
Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/alphabet.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -43,7 +43,6 @@
/* Local function prototypes: */
static void gen_char_list(void);
static int add_char(wchar_t uc);
-static void print_keymap(void);
static void set_letters(unsigned char* t);
static void show_letters(void);
static void clear_keyboard(void);
@@ -63,7 +62,7 @@
clear_keyboard();
- for (l=useEnglish; l<2; l++) {
+ for (l=settings.use_english; l<2; l++) {
sprintf( fn , "%s/keyboard.lst", realPath[l]);
if (CheckFile(fn)) {
unsigned char str[255];
@@ -95,8 +94,8 @@
j = i;
ALPHABET[(int)wide_str[j]] = 1; // first character is default
- for (i++; i<wcslen(wide_str); i++)
- KEYMAP[(int)wide_str[i]] = wide_str[j];
+ //for (i++; i<wcslen(wide_str); i++)
+ // KEYMAP[(int)wide_str[i]] = wide_str[j];
/* set the fingers for this letter */
@@ -111,12 +110,6 @@
fclose(f);
- DEBUGCODE
- {
- fprintf(stderr, "printing keymap for %s\n", fn);
- print_keymap();
- }
-
return;
}
}
@@ -151,7 +144,7 @@
(black_letters->w) + 5,
(black_letters->h) + 5,
32,
- rmask, gmask, bmask, amask);
+ RMASK, GMASK, BMASK, AMASK);
/* Use color key for eventual transparency: */
color_key = SDL_MapRGB(bg->format, 10, 10, 10);
SDL_FillRect(bg, NULL, color_key);
@@ -213,7 +206,7 @@
(black_letters->w) + 5,
(black_letters->h) + 5,
32,
- rmask, gmask, bmask, amask);
+ RMASK, GMASK, BMASK, AMASK);
/* Use color key for eventual transparency: */
color_key = SDL_MapRGB(bg->format, 10, 10, 10);
SDL_FillRect(bg, NULL, color_key);
@@ -329,6 +322,7 @@
num_words = 0;
}
+/* FIXME need a better i18n-compatible way to do this: */
/* UseAlphabet(): setups the word_list so that it really
* returns a LETTER when GetWord() is called
*/
@@ -716,27 +710,7 @@
}
-/* For debugging purposes: */
-static void print_keymap(void)
-{
- int i;
- for(i = 0; i < 256; i++)
- {
- fprintf(stderr, "i = %d\t(int)KEYMAP[i] = %d\tKEYMAP[i] = %lc\t",
- i, KEYMAP[i], KEYMAP[i]);
- if(isupper(i) && !islower(i))
- fprintf(stderr, "Upper\n");
- if(!isupper(i) && islower(i))
- fprintf(stderr, "Lower\n");
- if(isupper(i) && islower(i))
- fprintf(stderr, "Both\n");
- if(!isupper(i) && !islower(i))
- fprintf(stderr, "Neither\n");
- }
-}
-
-
/* Checks to see if the argument is already in the list and adds */
/* it if necessary. Returns 1 if char added, 0 if already in list, */
/* -1 if list already up to maximum size: */
@@ -784,7 +758,6 @@
ALPHABET[i]=0;
for (j=0; j<10; j++)
FINGER[i][j]=0;
- KEYMAP[i]=i;
}
}
/* This function just tidies up all the ptr args needed for */
Modified: tuxtype/trunk/tuxtype/audio.c
===================================================================
--- tuxtype/trunk/tuxtype/audio.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/audio.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -25,7 +25,7 @@
Mix_Music* defaultMusic = NULL; // holds music for audioMusicLoad/unload
void PlaySound(Mix_Chunk* snd) {
- if (!sys_sound) return;
+ if (!settings.sys_sound) return;
Mix_PlayChannel(-1, snd, 0);
}
@@ -34,7 +34,7 @@
* Note: loops == -1 means forever
*/
void MusicLoad(const char *musicFilename, int loops ) {
- if (!sys_sound) return;
+ if (!settings.sys_sound) return;
MusicUnload(); // make sure defaultMusic is clear
@@ -46,7 +46,7 @@
* loaded using the audioMusicLoad function
*/
void MusicUnload( void ) {
- if (!sys_sound) return;
+ if (!settings.sys_sound) return;
if ( defaultMusic )
Mix_FreeMusic( defaultMusic );
@@ -61,7 +61,7 @@
*/
void MusicPlay(Mix_Music* musicData, int loops)
{
- if (!sys_sound) return;
+ if (!settings.sys_sound) return;
/* Stop previous music before playing new one: */
MusicUnload();
Mix_PlayMusic(musicData, loops);
Modified: tuxtype/trunk/tuxtype/funcs.h
===================================================================
--- tuxtype/trunk/tuxtype/funcs.h 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/funcs.h 2007-08-01 23:02:27 UTC (rev 193)
@@ -63,6 +63,8 @@
Mix_Chunk* LoadSound(const char* datafile);
sprite* LoadSprite(const char* name, int MODE);
+/* In options.c: */
+void Opts_Initialize(void);
/* In pause.c: */
int Pause(void);
Modified: tuxtype/trunk/tuxtype/gettext.c
===================================================================
--- tuxtype/trunk/tuxtype/gettext.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/gettext.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -23,7 +23,7 @@
* we don't expect too large of a list (famous last words!)
*/
-/* FIXME don't think this file's code is UTF-8/Unicode compatible DSB */
+/* FIXME not sure if this file's code is UTF-8/Unicode compatible DSB */
struct node {
unsigned char *in; // the english
@@ -40,8 +40,8 @@
/* --- add a word to the linked list --- */
-void add_word(unsigned char *in, unsigned char *out) {
- item *cur;
+void add_word(unsigned char* in, unsigned char* out) {
+ item* cur;
/* -- allocate space for the node in the list -- */
cur = (item *)malloc(sizeof(item));
@@ -68,8 +68,8 @@
* -2 if file has errors in it
*/
- item *ptr;
- FILE *f;
+ item* ptr;
+ FILE* f;
unsigned char str[FNLEN];
unsigned char in[FNLEN];
unsigned char out[FNLEN];
@@ -176,7 +176,7 @@
item* cur = HEAD;
- if (useEnglish)
+ if (settings.use_english)
// the cast is to keep the compiler from complaining
// about "discarded qualifiers"
return (unsigned char*)in;
Modified: tuxtype/trunk/tuxtype/globals.h
===================================================================
--- tuxtype/trunk/tuxtype/globals.h 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/globals.h 2007-08-01 23:02:27 UTC (rev 193)
@@ -54,24 +54,56 @@
#endif // __GLOBALS_H__
-#define next_frame(SPRITE) if ((SPRITE)->num_frames) (SPRITE)->cur = (((SPRITE)->cur)+1) % (SPRITE)->num_frames;
-#define rewind(SPRITE) (SPRITE)->cur = 0;
+#define NEXT_FRAME(SPRITE) if ((SPRITE)->num_frames) (SPRITE)->cur = (((SPRITE)->cur)+1) % (SPRITE)->num_frames;
+#define REWIND(SPRITE) (SPRITE)->cur = 0;
#define MIN(x,y) ((x) < (y) ? (x) : (y))
#define MAX(x,y) ((x) > (y) ? (x) : (y))
-typedef struct {
- char lang[FNLEN];
- char path[FNLEN];
- char window[FNLEN];
- int sfx_volume;
- int mus_volume;
- int menu_music;
-} settings;
+/* Goal is to have all global settings here */
+/* (renamed from 'settings' to match tuxmath) */
+typedef struct game_option_type{
+ char default_data_path[FNLEN];
+ char theme_data_path[FNLEN];
+ char theme_name[FNLEN];
+ char lang[FNLEN];
+ char theme_font_name[FNLEN];
+ int use_english;
+ int fullscreen;
+ int sys_sound;
+ int sfx_volume;
+ int mus_volume;
+ int menu_music;
+ int speed_up;
+ int show_tux4kids;
+ int debug_on;
+ int o_lives;
+ int sound_vol;
+ int hidden; // Read the README file in the image directory for info on this ;)
+} game_option_type;
+/* Default values for game_option_type struct */
+/* They can be changed in the struct to other values at run-time */
+#define DEFAULT_MENU_FONT "AndikaDesRevG.ttf"
+#define DEFAULT_GAME_FONT "AndikaDesRevG.ttf"
+#define DEFAULT_USE_ENGLISH 1
+#define DEFAULT_FULLSCREEN 1
+#define DEFAULT_SYS_SOUND 1
+#define DEFAULT_SFX_VOLUME 100
+#define DEFAULT_MUS_VOLUME 100
+#define DEFAULT_MENU_MUSIC 1
+#define DEFAULT_SPEED_UP 0
+#define DEFAULT_SHOW_TUX4KIDS 1
+#define DEFAULT_DEBUG_ON 0
+#define DEFAULT_O_LIVES 0
+#define DEFAULT_SOUND_VOL 100
+#define DEFAULT_HIDDEN 0
+
+
+
typedef struct {
- SDL_Surface *frame[MAX_SPRITE_FRAMES];
- SDL_Surface *default_img;
+ SDL_Surface* frame[MAX_SPRITE_FRAMES];
+ SDL_Surface* default_img;
int num_frames;
int cur;
} sprite;
@@ -94,37 +126,36 @@
* all over the place!
*/
-#define LOG( str ) if (debugOn) fprintf( stderr, str );
-#define DEBUGCODE if (debugOn)
-#define DOUT(x) if (debugOn) fprintf(stderr, "%s = %d\n", #x, x);
+#define LOG( str ) if (settings.debug_on) fprintf( stderr, str );
+#define DEBUGCODE if (settings.debug_on)
+#define DOUT(x) if (settings.debug_on) fprintf(stderr, "%s = %d\n", #x, x);
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-#define rmask 0xff000000
-#define gmask 0x00ff0000
-#define bmask 0x0000ff00
-#define amask 0x000000ff
+#define RMASK 0xff000000
+#define GMASK 0x00ff0000
+#define BMASK 0x0000ff00
+#define AMASK 0x000000ff
#else
-#define rmask 0x000000ff
-#define gmask 0x0000ff00
-#define bmask 0x00ff0000
-#define amask 0xff000000
+#define RMASK 0x000000ff
+#define GMASK 0x0000ff00
+#define BMASK 0x00ff0000
+#define AMASK 0xff000000
#endif
-#define menu_font "AndikaDesRevG.ttf" /*"AndikaDesRevA.ttf" GenAI102.ttf or "DejaVuSans-Bold.ttf" or "FreeSansBold.ttf" */ /* was menu.ttf */
-#define menu_font_size 20
-#define ttf_font "AndikaDesRevG.ttf" /*AndikaDesRevA.ttf" GenAI102.ttf or "DejaVuSans-Bold.ttf" or "FreeSansBold.ttf" */ /* was letters.ttf */
-#define ttf_font_size 20
+#define MENU_FONT_SIZE 20
+#define GAME_FONT_SIZE 20
+
/* Limits on word list size, word length, and on the number of distinct characters */
/* that can be present within a word list: */
#define MAX_NUM_WORDS 500
#define MAX_WORD_SIZE 8
-#define MAX_UNICODES 1024
+#define MAX_UNICODES 1024
-#define WAIT_MS 2500
-#define FRAMES_PER_SEC 50
-#define FULL_CIRCLE 140
+#define WAIT_MS 2500
+#define FRAMES_PER_SEC 50
+#define FULL_CIRCLE 140
/* Menu Prototypes */
enum Game_Type {
@@ -135,9 +166,9 @@
LEVEL1, LEVEL2, LEVEL3, LEVEL4, LASER, INSTRUCT, NOT_CODED, NONE};
/* Title sequence constants */
-#define PRE_ANIM_FRAMES 10
-#define PRE_FRAME_MULT 3
-#define MENU_SEP 20
+#define PRE_ANIM_FRAMES 10
+#define PRE_FRAME_MULT 3
+#define MENU_SEP 20
/* paths */
@@ -151,10 +182,12 @@
//Game difficulty levels
enum { EASY, MEDIUM, HARD, INSANE, INF_PRACT };
-#define NUM_LEVELS 4
+#define NUM_LEVELS 4
-extern SDL_Surface *screen;
-extern TTF_Font *font;
+extern game_option_type settings;
+
+extern SDL_Surface* screen;
+extern TTF_Font* font;
extern SDL_Event event;
extern SDL_Color black;
@@ -164,26 +197,20 @@
extern SDL_Color white;
extern SDL_Color yellow;
-extern SDL_Surface *bkg;
-extern SDL_Surface *letters[255];
+extern SDL_Surface* bkg;
+extern SDL_Surface* letters[255];
+/* These need some work to support Unicode & i18n: */
extern wchar_t ALPHABET[256];
-extern wchar_t KEYMAP[256];
extern unsigned char FINGER[256][10];
extern int ALPHABET_SIZE;
-//global vars
-extern int speed_up;
-extern int show_tux4kids;
-extern int debugOn;
-extern int o_lives;
-extern int sound_vol;
-extern int hidden; // Read the README file in the image directory for info on this ;)
/* Alternative language/word/image/sound theming */
extern unsigned char realPath[2][FNLEN];
extern char themeName[FNLEN];
-extern int useEnglish;
+extern char fontName[FNLEN];
+//extern int useEnglish;
enum {
WIN_WAV,
@@ -197,9 +224,9 @@
NUM_WAVES
};
-extern Mix_Chunk *sound[NUM_WAVES];
-extern Mix_Music *music;
-extern int sys_sound;
+extern Mix_Chunk* sound[NUM_WAVES];
+extern Mix_Music* music;
+//extern int sys_sound;
#define MUSIC_FADE_OUT_MS 80
Modified: tuxtype/trunk/tuxtype/laser.c
===================================================================
--- tuxtype/trunk/tuxtype/laser.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/laser.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -21,11 +21,11 @@
#include "funcs.h"
#include "laser.h"
-sprite* shield;
-SDL_Surface* images[NUM_IMAGES];
-Mix_Chunk* sounds[NUM_SOUNDS];
-Mix_Music* musics[NUM_MUSICS];
-SDL_Surface* bkgd;
+sprite* shield = NULL;
+SDL_Surface* images[NUM_IMAGES] = {NULL};
+Mix_Chunk* sounds[NUM_SOUNDS] = {NULL};
+Mix_Music* musics[NUM_MUSICS] = {NULL};
+SDL_Surface* bkgd = NULL;
@@ -37,8 +37,9 @@
#define LEVEL_START_WAIT_START 20
#define LASER_START 5
#define NUM_ANS 8
+#define COMET_ZAP_FONT_SIZE 32
-/* Local (to game.c) 'globals': */
+/* Local (to laser.c) 'globals': */
int wave, speed, score, pre_wave_score, num_attackers, distanceMoved;
wchar_t ans[NUM_ANS];
@@ -182,22 +183,12 @@
if (level_start_wait > 0)
key = SDLK_UNKNOWN;
-// if (((event.key.keysym.unicode & 0xff)>=97) & ((event.key.keysym.unicode & 0xff)<=122)) {
-// ans[ans_num++] = KEYMAP[(event.key.keysym.unicode & 0xff)-32];
-// tux_pressing ++;
-// }else{
-// ans[ans_num++] = KEYMAP[event.key.keysym.unicode & 0xff];
-// tux_pressing ++;
-// }
key_unicode = event.key.keysym.unicode & 0xff;
DEBUGCODE
{
- fprintf(stderr,
- "key_unicode = %d\tKEYMAP[key_unicode] = %c\n",
- key_unicode,
- KEYMAP[key_unicode]);
+ fprintf(stderr, "key_unicode = %d\n", key_unicode);
}
/* For now, tuxtype is case-insensitive for input, */
@@ -211,12 +202,10 @@
DEBUGCODE
{
fprintf(stderr,
- "key_unicode = %d\tKEYMAP[key_unicode] = %c\n",
- key_unicode,
- KEYMAP[key_unicode]);
+ "key_unicode = %d\n", key_unicode);
}
/* Now update with case-folded value: */
- ans[ans_num++] = KEYMAP[key_unicode];
+ ans[ans_num++] = key_unicode;
}
}
@@ -235,7 +224,7 @@
if (comets[i].alive
&& comets[i].shootable
&& comets[i].expl == 0
- && KEYMAP[comets[i].ch] == ans[ans_num -1 ]
+ && comets[i].ch == ans[ans_num -1 ]
&& comets[i].y > lowest_y)
{
lowest = i;
@@ -542,7 +531,7 @@
/* Draw cities: */
- if (frame%2 == 0) next_frame( shield );
+ if (frame%2 == 0) NEXT_FRAME(shield);
for (i = 0; i < NUM_CITIES; i++) {
/* Decide which image to display: */
@@ -626,7 +615,7 @@
/* Keep playing music: */
- if (sys_sound && !Mix_PlayingMusic())
+ if (settings.sys_sound && !Mix_PlayingMusic())
MusicPlay(musics[MUS_GAME + (rand() % NUM_MUSICS)], 0);
/* Pause (keep frame-rate event) */
@@ -644,7 +633,7 @@
SDL_FreeSurface(bkgd);
/* Stop music: */
- if ((sys_sound) && (Mix_PlayingMusic()))
+ if ((settings.sys_sound) && (Mix_PlayingMusic()))
Mix_HaltMusic();
laser_unload_data();
@@ -669,7 +658,7 @@
/* Create the SDL_Surfaces for all of the characters */
/* used in the word list: */
- font = LoadFont( ttf_font, 32);
+ font = LoadFont(settings.theme_font_name, COMET_ZAP_FONT_SIZE);
RenderLetters(font);
/* Load images: */
@@ -677,7 +666,7 @@
images[i] = LoadImage(image_filenames[i], IMG_ALPHA);
shield = LoadSprite( "cities/shield", IMG_ALPHA );
- if (sys_sound) {
+ if (settings.sys_sound) {
for (i = 0; i < NUM_SOUNDS; i++)
sounds[i] = LoadSound(sound_filenames[i]);
@@ -698,7 +687,7 @@
for (i = 0; i < NUM_IMAGES; i++)
SDL_FreeSurface(images[i]);
- if (sys_sound) {
+ if (settings.sys_sound) {
for (i = 0; i < NUM_SOUNDS; i++)
Mix_FreeChunk(sounds[i]);
for (i = 0; i < NUM_MUSICS; i++)
Modified: tuxtype/trunk/tuxtype/loaders.c
===================================================================
--- tuxtype/trunk/tuxtype/loaders.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/loaders.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -59,6 +59,9 @@
return 0;
}
+
+/* FIXME need to read language's font name, if needed - e.g. Russian. */
+/* also should have return value reflect success or failure. */
void LoadLang(void)
{
char fn[FNLEN];
@@ -68,7 +71,7 @@
* different than the other loaders
*/
- if (useEnglish)
+ if (settings.use_english)
{
/* We need to set the locale to something supporting UTF-8: */
if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
@@ -134,7 +137,7 @@
out = SDL_CreateRGBSurface(
SDL_SWSURFACE,
- in->w, in->h, 32, rmask, gmask, bmask, amask);
+ in->w, in->h, 32, RMASK, GMASK, BMASK, AMASK);
/* --- flip horizontally if requested --- */
@@ -205,7 +208,7 @@
/* try to find font first in theme dir, then in default */
- for (i=useEnglish; i<2; i++) {
+ for (i=settings.use_english; i<2; i++) {
sprintf( fn, "%s/fonts/%s", realPath[i], fontfile );
DEBUGCODE { fprintf(stderr, "LoadFont(): looking for %s using data paths\n", fn ); }
{
@@ -244,11 +247,11 @@
{
int i;
int oldDebug; //so we can turn off debug output for this func only
- SDL_Surface *tmp_pic = NULL, *final_pic = NULL;
+ SDL_Surface* tmp_pic = NULL, *final_pic = NULL;
char fn[FNLEN];
- oldDebug = debugOn; // suppress output for now
- debugOn = 0;
+ oldDebug = settings.debug_on; // suppress output for now
+ settings.debug_on = 0;
DEBUGCODE { fprintf(stderr, "LoadImage: loading %s\n", datafile ); }
@@ -260,7 +263,7 @@
1 1 1
*/
- for (i = (useEnglish || (mode & IMG_NO_THEME)); i<2; i++) {
+ for (i = (settings.use_english || (mode & IMG_NO_THEME)); i<2; i++) {
sprintf( fn, "%s/images/%s", realPath[i], datafile );
DEBUGCODE { fprintf(stderr, "LoadImage: looking in %s\n", fn); }
@@ -277,7 +280,7 @@
if (tmp_pic == NULL) {
if (mode & IMG_NOT_REQUIRED)
{
- debugOn = oldDebug;
+ settings.debug_on = oldDebug;
return NULL;
}
@@ -316,7 +319,7 @@
LOG( "LOADIMAGE: Done\n" );
- debugOn = oldDebug;
+ settings.debug_on = oldDebug;
return (final_pic);
}
@@ -381,7 +384,7 @@
char fn[FNLEN];
int i;
- for (i = useEnglish; i<2; i++) {
+ for (i = settings.use_english; i<2; i++) {
sprintf(fn , "%s/sounds/%s", realPath[i], datafile);
tempChunk = Mix_LoadWAV(fn);
if (tempChunk)
@@ -403,7 +406,7 @@
Mix_Music *tempMusic;
int i;
- for (i = useEnglish; i<2; i++) {
+ for (i = settings.use_english; i<2; i++) {
sprintf( fn , "%s/sounds/%s", realPath[i], datafile );
tempMusic = Mix_LoadMUS(fn);
if (tempMusic)
Modified: tuxtype/trunk/tuxtype/main.c
===================================================================
--- tuxtype/trunk/tuxtype/main.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/main.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -19,45 +19,49 @@
#include "globals.h"
#include "funcs.h"
-SDL_Surface *screen;
-SDL_Surface *bkg;
+SDL_Surface* screen;
+SDL_Surface* bkg;
-// HACK: add tux trudging off after losing laser game...
-int sys_sound;
SDL_Event event;
-extern settings localsettings;
+
/********************
main : init stuff
*********************/
int main(int argc, char *argv[])
{
- Uint32 video_flags = 0,
- lib_flags = 0;
- int i;
-
- sys_sound = 1; //default using system sounds
- speed_up = 0; //run at normal speed
- show_tux4kids = 1; //show tux4kids logo the first time in main menu
- useEnglish = 1; //default to no theme
- debugOn = 0; //default to not in debug mode
- hidden = 0; //default to no "hidden" background
+ Uint32 video_flags = 0,
+ lib_flags = 0;
+ int i;
+ /* Initialize settings with hard-coded defaults: */
+ Opts_Initialize();
+// settings.sys_sound = 1; //default using system sounds
+// settings.speed_up = 0; //run at normal speed
+// settings.show_tux4kids = 1; //show tux4kids logo the first time in main menu
+// settings.use_english = 1; //default to no theme
+// settings.debug_on = 0; //default to not in debug mode
+// settings.hidden = 0; //default to no "hidden" background
+
+
srand(time(NULL));
// This sets realPath[] to the default theme file path:
SetupTheme(NULL);
LoadSettings();
- DEBUGCODE { printf("Window setting from config file is: %s\n", localsettings.window );}
+ DEBUGCODE { printf("Window setting from config file is: %d\n", settings.fullscreen);}
- if (strncmp ( localsettings.window, "yes", FNLEN ) == 0 ){
- video_flags = (SDL_SWSURFACE | SDL_HWPALETTE);
- } else {
- video_flags = (SDL_FULLSCREEN | SDL_SWSURFACE | SDL_HWPALETTE);
+ if (settings.fullscreen)
+ {
+ video_flags = (SDL_FULLSCREEN | SDL_SWSURFACE | SDL_HWPALETTE);
+ }
+ else
+ {
+ video_flags = (SDL_SWSURFACE | SDL_HWPALETTE);
}
lib_flags = SDL_INIT_VIDEO;
@@ -107,27 +111,27 @@
if ((strcmp(argv[i], "-sp") == 0) |
(strcmp(argv[i], "--speed") == 0))
- speed_up = 1;
+ settings.speed_up = 1;
if ((strcmp(argv[i], "-d") == 0) |
(strcmp(argv[i], "--debug") == 0))
- debugOn = 1;
+ settings.debug_on = 1;
if ((strcmp(argv[i], "-s") == 0) |
(strcmp(argv[i], "--sound") == 0))
- sys_sound = 1;
+ settings.sys_sound = 1;
if ((strcmp(argv[i], "-ns") == 0) |
(strcmp(argv[i], "--nosound") == 0))
- sys_sound = 0;
+ settings.sys_sound = 0;
if ((strcmp(argv[i], "--hidden") == 0) |
(strcmp(argv[i], "-hidden") == 0))
- hidden = 1;
+ settings.hidden = 1;
if ((strcmp(argv[i], "-t") == 0) |
(strcmp(argv[i], "--theme") == 0))
- SetupTheme( argv[++i] );
+ SetupTheme(argv[++i]);
}
DEBUGCODE {
@@ -139,9 +143,10 @@
LibInit(lib_flags); /* calls SDL_Init(), TTF_Init(), some other settings */
GraphicsInit(video_flags); /* calls SDL_SetVideoMode(), a few others */
- if (sys_sound){
- Mix_VolumeMusic(localsettings.mus_volume);
- Mix_Volume(-1,localsettings.sfx_volume);
+ if (settings.sys_sound)
+ {
+ Mix_VolumeMusic(settings.mus_volume);
+ Mix_Volume(-1, settings.sfx_volume);
}
/* Fix: we should check config files/environment variables like LANG! */
Modified: tuxtype/trunk/tuxtype/pause.c
===================================================================
--- tuxtype/trunk/tuxtype/pause.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/pause.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -23,7 +23,7 @@
SDL_Surface *up, *down, *left, *right;
SDL_Rect rectUp, rectDown, rectLeft, rectRight;
TTF_Font *f1, *f2;
-extern settings localsettings;
+extern game_option_type settings;
/* Local function prototypes: */
void darkenscreen(void);
@@ -36,7 +36,8 @@
/**********************
Pause : Pause the game
***********************/
-int Pause( void ) {
+int Pause(void)
+{
int paused = 1;
int sfx_volume=0;
int old_sfx_volume;
@@ -51,7 +52,7 @@
/* --- stop all sounds, play pause noise --- */
- if (sys_sound) {
+ if (settings.sys_sound) {
Mix_Pause(-1);
Mix_PlayChannel(-1, pause_sfx, 0);
sfx_volume = Mix_Volume(-1, -1); // get sfx volume w/o changing it
@@ -67,7 +68,7 @@
pause_draw_info();
- if (sys_sound) {
+ if (settings.sys_sound) {
draw_vols(sfx_volume, mus_volume);
}
@@ -86,7 +87,7 @@
exit(0);
break;
case SDL_KEYUP:
- if (sys_sound &&
+ if (settings.sys_sound &&
((event.key.keysym.sym == SDLK_RIGHT) ||
(event.key.keysym.sym == SDLK_LEFT)))
tocks = 0;
@@ -98,7 +99,7 @@
paused = 0;
quit = 1;
}
- if (sys_sound) {
+ if (settings.sys_sound) {
if (event.key.keysym.sym == SDLK_RIGHT)
sfx_volume += 4;
if (event.key.keysym.sym == SDLK_LEFT)
@@ -119,7 +120,7 @@
break;
}
- if (sys_sound && mousePressed) {
+ if (settings.sys_sound && mousePressed) {
int x, y;
SDL_GetMouseState(&x, &y);
@@ -149,7 +150,7 @@
}
}
- if (sys_sound) {
+ if (settings.sys_sound) {
if (sfx_volume > MIX_MAX_VOLUME)
sfx_volume = MIX_MAX_VOLUME;
@@ -174,8 +175,8 @@
}
draw_vols(sfx_volume, mus_volume);
- localsettings.mus_volume=mus_volume;
- localsettings.sfx_volume=sfx_volume;
+ settings.mus_volume=mus_volume;
+ settings.sfx_volume=sfx_volume;
SDL_Flip(screen);
}
}
@@ -189,7 +190,7 @@
SDL_ShowCursor(0);
- if (sys_sound) {
+ if (settings.sys_sound) {
Mix_PlayChannel(-1, pause_sfx, 0);
Mix_Resume(-1);
}
@@ -201,7 +202,7 @@
void PauseLoadMedia(void) {
- if (sys_sound)
+ if (settings.sys_sound)
pause_sfx = LoadSound( "tock.wav" );
up = LoadImage("up.png", IMG_ALPHA);
@@ -216,12 +217,12 @@
right = LoadImage("right.png", IMG_ALPHA);
rectRight.w = right->w; rectRight.h = right->h;
- f1 = LoadFont( ttf_font, 24 );
- f2 = LoadFont( ttf_font, 36 );
+ f1 = LoadFont(settings.theme_font_name, 24);
+ f2 = LoadFont(settings.theme_font_name, 36);
}
void PauseUnloadMedia(void) {
- if (sys_sound)
+ if (settings.sys_sound)
Mix_FreeChunk(pause_sfx);
SDL_FreeSurface(up);
SDL_FreeSurface(down);
@@ -259,7 +260,7 @@
rectLeft.x = rectDown.x = 320 - (7*16) - rectLeft.w - 4;
rectRight.x = rectUp.x = 320 + (7*16) + 4;
- if (sys_sound) {
+ if (settings.sys_sound) {
SDL_BlitSurface(left, NULL, screen, &rectLeft);
SDL_BlitSurface(right, NULL, screen, &rectRight);
@@ -268,7 +269,7 @@
SDL_BlitSurface(up, NULL, screen, &rectUp);
}
- if (sys_sound) {
+ if (settings.sys_sound) {
t = BlackOutline(_("Sound Effects Volume"), f1, &white);
s.y = 160;
@@ -342,19 +343,24 @@
* RESULT: it will darken the screen by a factor of 4
* WARNING: only works on 16bit screens right now!
*/
-void darkenscreen( void ){
- Uint16 rm = screen->format->Rmask;
- Uint16 gm = screen->format->Gmask;
- Uint16 bm = screen->format->Bmask;
- Uint16 *p;
- int x, y;
+void darkenscreen(void)
+{
+ Uint16 rm = screen->format->Rmask;
+ Uint16 gm = screen->format->Gmask;
+ Uint16 bm = screen->format->Bmask;
+ Uint16* p;
+ int x, y;
- p = screen->pixels;
+ p = screen->pixels;
- for (y = 0; y<480; y++)
- for (x = 0; x<640; x++) {
- *p = (((*p&rm)>>2)&rm) | (((*p&gm)>>2)&gm) | (((*p&bm)>>2)&bm); p++;
- }
+ for (y = 0; y < 480; y++)
+ {
+ for (x = 0; x < 640; x++)
+ {
+ *p = (((*p&rm)>>2)&rm) | (((*p&gm)>>2)&gm) | (((*p&bm)>>2)&bm);
+ p++;
+ }
+ }
}
Modified: tuxtype/trunk/tuxtype/playgame.c
===================================================================
--- tuxtype/trunk/tuxtype/playgame.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/playgame.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -24,11 +24,13 @@
//void add_words( int level );
+/* Should these be constants? */
int tux_max_width; // the max width of the images of tux
int number_max_w; // the max width of a number image
-int o_lives; // something cal is working on
-int sound_vol;
+//int o_lives; // something cal is working on
+//int sound_vol;
+
SDL_Surface* background;
SDL_Surface* level[NUM_LEVELS];
@@ -135,9 +137,7 @@
LoadTuxAnims();
LoadFishies();
LoadOthers();
- LOG( " before RenderLetters()\n" );
RenderLetters(font);
- LOG( " after RenderLetters()\n" );
LOG( " starting game \n ");
while (still_playing) {
@@ -147,22 +147,22 @@
switch (diflevel) {
case EASY:
fish_left = MAX_FISHIES_EASY;
- if (o_lives > LIVES_INIT_EASY){
- curlives = o_lives;
+ if (settings.o_lives > LIVES_INIT_EASY){
+ curlives = settings.o_lives;
}else
curlives = LIVES_INIT_EASY;
break;
case MEDIUM:
fish_left = MAX_FISHIES_MEDIUM;
- if (o_lives > LIVES_INIT_MEDIUM){
- curlives = o_lives;
+ if (settings.o_lives > LIVES_INIT_MEDIUM){
+ curlives = settings.o_lives;
}else
curlives = LIVES_INIT_MEDIUM;
break;
case HARD:
fish_left = MAX_FISHIES_HARD;
- if (o_lives > LIVES_INIT_HARD){
- curlives = o_lives;
+ if (settings.o_lives > LIVES_INIT_HARD){
+ curlives = settings.o_lives;
}else
curlives = LIVES_INIT_HARD;
break;
@@ -181,7 +181,7 @@
/* --- Special Hidden Code --- */
- if (hidden && curlevel == 3)
+ if (settings.hidden && curlevel == 3)
sprintf(filename, "hidden.jpg");
DEBUGCODE {
@@ -195,7 +195,7 @@
ResetObjects();
- if (sys_sound) {
+ if (settings.sys_sound) {
sprintf(filename, "kmus%i.wav", curlevel + 1);
MusicLoad( filename, -1 );
}
@@ -224,11 +224,11 @@
if (event.key.keysym.sym == SDLK_F11)
SDL_SaveBMP( screen, "screenshot.bmp" );
if (event.key.keysym.sym == SDLK_F6){
- o_lives=o_lives-10;
+ settings.o_lives=settings.o_lives-10;
curlives=curlives-10;
}
if (event.key.keysym.sym == SDLK_F7) {
- o_lives=o_lives+10;
+ settings.o_lives=settings.o_lives+10;
curlives=curlives+10;
}
if (event.key.keysym.sym == SDLK_F10)
@@ -245,14 +245,6 @@
DrawBackground();
}
-// /* ASCII lowercase is 97-122, whereas uppercase is */
-// /* 65-90 - this if() converts lowercase to corresponding */
-// /* uppercase - not sure we always want this! */
-// if (((event.key.keysym.unicode & 0xff) >= 97) & ((event.key.keysym.unicode & 0xff) <= 122)){
-// UpdateTux(KEYMAP[(event.key.keysym.unicode & 0xff)-32], fishies, frame);
-// } else {
-// UpdateTux(KEYMAP[(event.key.keysym.unicode & 0xff)], fishies, frame);
-// }
key_unicode = event.key.keysym.unicode & 0xff;
/* For now, tuxtype is case-insensitive for input, */
@@ -260,8 +252,8 @@
DEBUGCODE
{
fprintf(stderr,
- "\nkey_unicode = %d\twchar_t = %lc\tKEYMAP[key_unicode] = %c\n",
- key_unicode, key_unicode, KEYMAP[key_unicode]);
+ "\nkey_unicode = %d\twchar_t = %lc\t\n",
+ key_unicode, key_unicode);
}
if (key_unicode >= 97 && key_unicode <= 122)
@@ -273,17 +265,17 @@
DEBUGCODE
{
fprintf(stderr,
- "key_unicode = %d\twchar_t = %lc\tKEYMAP[key_unicode] = %c\n\n",
- key_unicode, key_unicode, KEYMAP[key_unicode]);
+ "key_unicode = %d\twchar_t = %lc\\n\n",
+ key_unicode, key_unicode);
}
/* Now update with case-folded value: */
- UpdateTux(KEYMAP[key_unicode], fishies, frame);
+ UpdateTux(key_unicode, fishies, frame);
}
/* --- fishy updates --- */
- if ((frame % 10) == 0) next_frame( fishy );
+ if ((frame % 10) == 0) NEXT_FRAME( fishy );
if (fishies < local_max_fishies)
SpawnFishies( diflevel, &fishies, &frame );
@@ -318,12 +310,12 @@
if (!quitting) {
UpdateScreen(&frame);
- if (speed_up == 0)
+ if (!settings.speed_up)
WaitFrame();
}
}
- if (sys_sound)
+ if (settings.sys_sound)
Mix_FadeOutMusic(MUSIC_FADE_OUT_MS);
DrawBackground();
@@ -351,11 +343,11 @@
xamp = WIN_GAME_XAMP;
yamp = WIN_GAME_YAMP;
- if (sys_sound)
+ if (settings.sys_sound)
Mix_PlayChannel(WINFINAL_WAV, sound[WINFINAL_WAV], 0);
}
- if (sys_sound)
+ if (settings.sys_sound)
Mix_PlayChannel(WIN_WAV, sound[WIN_WAV], 0);
for (i = 0; i < CONGRATS_FRAMES; i++)
@@ -372,7 +364,7 @@
xamp = 0;
yamp = 0;
- if (sys_sound)
+ if (settings.sys_sound)
Mix_PlayChannel(LOSE_WAV, sound[LOSE_WAV], 0);
for (i = 0; i < OH_NO_FRAMES; i++)
@@ -417,7 +409,7 @@
EraseObject(temp_text[temp_text_count], text_rect.x, y_not);
- if (speed_up == 0)
+ if (!settings.speed_up)
WaitFrame();
}
}
@@ -636,7 +628,7 @@
return 0;
for (i=0; i < wcslen(fish_object[f].word); i++)
- if (KEYMAP[fish_object[f].word[i]] != KEYMAP[tux_object.word[tux_object.wordlen - wcslen(fish_object[f].word)+i]])
+ if (fish_object[f].word[i] != tux_object.word[tux_object.wordlen - wcslen(fish_object[f].word) + i])
return 0;
return 1;
@@ -928,7 +920,7 @@
LOG( "=LoadOthers()\n" );
- font = LoadFont( ttf_font, ttf_font_size );
+ font = LoadFont(settings.theme_font_name, GAME_FONT_SIZE);
curlev = BlackOutline(_("Level"), font, &white);
lives = BlackOutline(_("Lives"), font, &white);
@@ -955,7 +947,7 @@
ohno[i] = BlackOutline(_("Oh No!"), font, &white);
}
- if (sys_sound) {
+ if (settings.sys_sound) {
LOG( "=Loading Sound FX\n" );
sound[WIN_WAV] = LoadSound( "win.wav" );
@@ -1156,7 +1148,7 @@
for (i = 0; i < OH_NO_FRAMES; i++)
SDL_FreeSurface(ohno[i]);
- if (sys_sound) {
+ if (settings.sys_sound) {
LOG( "-Freeing sound\n" );
for (i = 0; i < NUM_WAVES; ++i)
@@ -1363,7 +1355,7 @@
if (*curlives <= 0)
*curlives = 0;
- if ( sys_sound )
+ if ( settings.sys_sound )
Mix_PlayChannel(SPLAT_WAV, sound[SPLAT_WAV], 0);
}
@@ -1418,7 +1410,7 @@
int k;
for (k = 0; k < tux_object.wordlen - j; k++)
{
- if (KEYMAP[fish_object[which].word[k]] != KEYMAP[tux_object.word[j+k]])
+ if (fish_object[which].word[k] != tux_object.word[j + k])
k = 100000;
}
@@ -1562,16 +1554,16 @@
*fish_left = *fish_left - 1;
tux_object.state = TUX_GULPING;
- rewind(tux_object.spr[TUX_GULPING][tux_object.facing]);
+ REWIND(tux_object.spr[TUX_GULPING][tux_object.facing]);
tux_object.dx = 0;
tux_object.endx = tux_object.x;
- if (sys_sound) Mix_PlayChannel(BITE_WAV, sound[BITE_WAV], 0);
+ if (settings.sys_sound) Mix_PlayChannel(BITE_WAV, sound[BITE_WAV], 0);
} else if (tux_object.state == TUX_STANDING) {
LOG( "***EXCUSE ME!** - in CheckCollision()\n" );
- if (sys_sound && !Mix_Playing(EXCUSEME_WAV))
+ if (settings.sys_sound && !Mix_Playing(EXCUSEME_WAV))
Mix_PlayChannel(EXCUSEME_WAV, sound[EXCUSEME_WAV], 0);
}
}
@@ -1582,9 +1574,9 @@
static void next_tux_frame(void) {
if ( tux_object.state != TUX_GULPING ) {
- next_frame(tux_object.spr[tux_object.state][tux_object.facing]);
+ NEXT_FRAME(tux_object.spr[tux_object.state][tux_object.facing]);
} else {
- next_frame(tux_object.spr[TUX_GULPING][tux_object.facing]);
+ NEXT_FRAME(tux_object.spr[TUX_GULPING][tux_object.facing]);
if (tux_object.spr[TUX_GULPING][tux_object.facing]->cur==0)
tux_object.state = TUX_STANDING;
}
@@ -1623,14 +1615,14 @@
tux_object.state = TUX_WALKING;
//stop running sound (if playing)
- if (sys_sound && Mix_Playing(RUN_WAV))
+ if (settings.sys_sound && Mix_Playing(RUN_WAV))
Mix_HaltChannel(RUN_WAV);
} else {
if (time_to_splat > frame)
tux_object.dx = float_restrict( MIN_RUNNING_SPEED, abs(tux_object.endx - tux_object.x) / (time_to_splat-frame), MAX_RUNNING_SPEED );
else {
tux_object.dx = MAX_RUNNING_SPEED;
- if (sys_sound && !Mix_Playing(RUN_WAV))
+ if (settings.sys_sound && !Mix_Playing(RUN_WAV))
if (abs(tux_object.endx - tux_object.x) > 50)
Mix_PlayChannel(RUN_WAV, sound[RUN_WAV], 0);
}
Modified: tuxtype/trunk/tuxtype/practice.c
===================================================================
--- tuxtype/trunk/tuxtype/practice.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/practice.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -19,19 +19,19 @@
#include "globals.h"
#include "funcs.h"
-SDL_Surface *hands;
-SDL_Surface *hand[11];
+SDL_Surface* hands;
+SDL_Surface* hand[11];
SDL_Rect hand_loc, letter_loc;
-TTF_Font *font;
+TTF_Font* font;
char phrase[255][FNLEN];
-Mix_Chunk *wrong;
+Mix_Chunk* wrong;
/*local function prototypes: */
static int get_phrase(const char* phr);
static void practice_load_media(void);
static void practice_unload_media(void);
-static void print_at(const char *pphrase, int wrap, int x, int y);
+static void print_at(const char* pphrase, int wrap, int x, int y);
static void show(unsigned char t);
@@ -131,14 +131,14 @@
//practice next phase in list
//a=a;
} else {
- if (ALPHABET[KEYMAP[event.key.keysym.unicode]] && pphrase[c]==(char)event.key.keysym.unicode){
+ if (ALPHABET[event.key.keysym.unicode] && pphrase[c]==(char)event.key.keysym.unicode){
state=0;
dst2.x=40;
dst4.x=480;
SDL_BlitSurface(bkg, &dst3, screen, &dst2);
SDL_BlitSurface(bkg, &dst5, screen, &dst4);
SDL_Flip(screen);
- SDL_BlitSurface(letters[KEYMAP[event.key.keysym.unicode]], NULL, screen, &dst);
+ SDL_BlitSurface(letters[event.key.keysym.unicode], NULL, screen, &dst);
for (z=0;z<strlen(keytime);z++){
SDL_BlitSurface(letters[(int)keytime[z]], NULL, screen, &dst2);
dst2.x = dst2.x + letters[(int)keytime[z]]->w-2;
@@ -147,7 +147,7 @@
SDL_BlitSurface(letters[(int)totaltime[z]], NULL, screen, &dst4);
dst4.x = dst4.x + letters[(int)totaltime[z]]->w-2;
}
- dst.x = (dst.x + letters[KEYMAP[event.key.keysym.unicode]]->w) - 5;
+ dst.x = (dst.x + letters[event.key.keysym.unicode]->w) - 5;
if (c==(strlen(pphrase)-1)){
print_at("Great!",6 ,275 ,200);
SDL_Flip(screen);
@@ -204,7 +204,7 @@
bkg = LoadImage("main_bkg.png", IMG_ALPHA);
- font = LoadFont( ttf_font, 32 );
+ font = LoadFont(settings.theme_font_name, 32 );
wrong = LoadSound("tock.wav");
Modified: tuxtype/trunk/tuxtype/scripting.c
===================================================================
--- tuxtype/trunk/tuxtype/scripting.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/scripting.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -39,7 +39,7 @@
void InstructCascade(void)
{
char fn[FNLEN];
- sprintf( fn, "%s/scripts/cascade.xml", realPath[useEnglish] );
+ sprintf( fn, "%s/scripts/cascade.xml", realPath[settings.use_english] );
if (load_script( fn ) != 0) return; // bail if any errors occur
run_script();
}
@@ -48,7 +48,7 @@
void InstructLaser(void)
{
char fn[FNLEN];
- sprintf( fn, "%s/scripts/laser.xml", realPath[useEnglish] );
+ sprintf( fn, "%s/scripts/laser.xml", realPath[settings.use_english] );
if (load_script( fn ) != 0) return; // bail if any errors occur
{ int i; for (i=0; i<20; i++) {
run_script(); SDL_Delay(500); }}
@@ -93,7 +93,7 @@
/* find the directory to load wordlists from */
- for (i=useEnglish; i<2; i++) {
+ for (i=settings.use_english; i<2; i++) {
sprintf( wordPath, "%s/scripts", realPath[i] );
if (CheckFile(wordPath))
break;
@@ -110,7 +110,7 @@
/* create a list of all the .txt files */
wordsDir = opendir( wordPath );
- font = LoadFont( ttf_font, 14 );
+ font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);
do {
wordsFile = readdir(wordsDir);
if (!wordsFile)
@@ -129,7 +129,7 @@
SDL_BlitSurface( filenames[c], NULL, screen, &spot );
SDL_FreeSurface(filenames[c]);
c++;
- spot.y+=18;
+ spot.y += MENU_FONT_SIZE;
/* load the name for the wordlist from the file ... (1st line) */
/* tempFile = fopen( wordlistFile[lists], "r" );
@@ -251,7 +251,7 @@
start = loc;
for (i = start; i < c; i++) {
spot.x = 5;
- spot.y = (i*18)+10;
+ spot.y = (i * MENU_FONT_SIZE) + 18;
if (i == loc)
SDL_BlitSurface(pointer, NULL, screen, &spot);
}
@@ -707,8 +707,8 @@
/* --- does it do click and play --- */
if (curItem->onclick) {
- if (sys_sound)
- clickWavs[numClicks] = LoadSound( curItem->onclick );
+ if (settings.sys_sound)
+ clickWavs[numClicks] = LoadSound(curItem->onclick);
clickRects[numClicks].x = loc.x;
clickRects[numClicks].y = loc.y;
clickRects[numClicks].w = loc.w;
@@ -732,9 +732,9 @@
/* --- create font & render text --- */
if (curItem->size > 0)
- myFont = LoadFont( ttf_font, (int)curItem->size );
+ myFont = LoadFont(settings.theme_font_name, (int)curItem->size );
else
- myFont = LoadFont( ttf_font, 24 ); // default size is 24
+ myFont = LoadFont(settings.theme_font_name, 24 ); // default size is 24
if (curItem->color) col = curItem->color;
else if (curPage->fgcolor) col = curPage->fgcolor;
@@ -900,27 +900,35 @@
/* --- cleanup memory --- changing pages --- */
- {
- int i;
- if (sys_sound){
- for (i=0; i<numWavs; i++) {
- Mix_HaltChannel( i );
- Mix_FreeChunk( sounds[i] );
- }
- for (i=0; i<numClicks; i++) {
- Mix_HaltChannel( i + numWavs );
- Mix_FreeChunk( clickWavs[i] );
- }
- }
- }
+ {
+ int i;
+
+ if (settings.sys_sound)
+ {
+ for (i=0; i<numWavs; i++)
+ {
+ Mix_HaltChannel(i);
+ Mix_FreeChunk(sounds[i]);
+ }
+
+ for (i = 0; i < numClicks; i++)
+ {
+ Mix_HaltChannel(i + numWavs);
+ Mix_FreeChunk(clickWavs[i]);
+ }
+ }
+
}
+ }
}
static void clear_items(itemType* i)
{
- itemType *n;
+ itemType* n;
+
+ /* if i is null, will return harmlessly: */
while (i) {
n = i->next; // remember the next guy
@@ -939,7 +947,9 @@
static void clear_pages(pageType* p)
{
- pageType *n;
+ pageType* n;
+
+ /* if p is null, will return harmlessly: */
while (p) {
n = p->next; // remember the next guy
Modified: tuxtype/trunk/tuxtype/setup.c
===================================================================
--- tuxtype/trunk/tuxtype/setup.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/setup.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -22,15 +22,8 @@
//global vars
+//int hidden; // Read the README file in the image directory for info on this ;)
-int speed_up;
-int show_tux4kids;
-int debugOn;
-
-int hidden; // Read the README file in the image directory for info on this ;)
-
-settings localsettings;
-
/***************************
GraphicsInit: Initializes the graphic system
****************************/
@@ -89,14 +82,14 @@
LOG( "LibInit():\n-About to init SDL Library\n" );
if (SDL_Init(lib_flags) < 0)
- if (sys_sound) {
+ if (settings.sys_sound) {
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
fprintf(stderr, "Couldn't initialize SDL: %s\n",
SDL_GetError());
exit(2);
} else {
LOG( "Couldn't initialize SDL Sound\n" );
- sys_sound = 0;
+ settings.sys_sound = 0;
}
}
@@ -105,10 +98,10 @@
LOG( "-SDL Library init'd successfully\n" );
- if (sys_sound)
+ if (settings.sys_sound)
if (Mix_OpenAudio( 22050, AUDIO_S16, 1, 2048) < 0) {
fprintf( stderr, "Warning: couldn't set 22050 Hz 8-bit audio\n - Reasons: %s\n", SDL_GetError());
- sys_sound=0;
+ settings.sys_sound=0;
}
LOG( "-about to init SDL_ttf\n" );
@@ -156,8 +149,8 @@
/* FIXME should set complete default profile if file not found */
if (settingsFile == NULL) {
printf("LoadSettings: Settings file does not exist! settings not loaded\n");
- localsettings.mus_volume = 100;
- localsettings.sfx_volume = 100;
+ settings.mus_volume = 100;
+ settings.sfx_volume = 100;
return;
}
@@ -170,28 +163,28 @@
if (strncmp( setting, "lang", FNLEN ) == 0 ) {
DEBUGCODE { printf("LoadSettings: Setting language to %s", value); }
- strncpy( localsettings.lang, value, FNLEN-1 );
- localsettings.lang[FNLEN-1]=0;
+ strncpy(settings.lang, value, FNLEN-1 );
+ settings.lang[FNLEN-1]=0;
SetupTheme(value);
}
if (strncmp( setting, "o_lives", FNLEN ) == 0 ) {
DEBUGCODE { printf("LoadSettings: Setting lives to %s", value); }
- o_lives = atoi(value);
+ settings.o_lives = atoi(value);
}
if (strncmp( setting, "mus_volume", FNLEN ) == 0 ) {
- DEBUGCODE { printf("LoadSettings: Setting misic volume to %s", value); }
- localsettings.mus_volume = atoi(value);
+ DEBUGCODE { printf("LoadSettings: Setting music volume to %s", value); }
+ settings.mus_volume = atoi(value);
}
if (strncmp( setting, "sfx_volume", FNLEN ) == 0 ) {
DEBUGCODE { printf("LoadSettings: Setting effects volume to %s", value); }
- localsettings.sfx_volume = atoi(value);
+ settings.sfx_volume = atoi(value);
}
if (strncmp( setting, "menu_music", FNLEN ) == 0 ) {
DEBUGCODE { printf("LoadSettings: Setting menu music to %s", value); }
- localsettings.menu_music = atoi(value);
+ settings.menu_music = atoi(value);
}
- if (strncmp( setting, "window", FNLEN ) == 0 ) {
- strncpy(localsettings.window, value, FNLEN-1 );
+ if (strncmp( setting, "fullscreen", FNLEN ) == 0 ) {
+ settings.fullscreen = atoi(value);
}
}
@@ -202,9 +195,10 @@
/* Save the settings from a file... make sure to update LoadSettings if you change
* what can be saved/loaded
*/
-void SaveSettings( void ) {
+void SaveSettings(void)
+{
char fn[FNLEN];
- FILE *settingsFile;
+ FILE* settingsFile;
/* set the settings directory/file */
@@ -232,17 +226,19 @@
/* Save all the settings here! */
if (strncmp( themeName, "", FNLEN) != 0)
fprintf( settingsFile, "lang=%s\n", themeName );
- if (o_lives > 9)
- fprintf( settingsFile, "o_lives=%d\n", o_lives );
+ if (settings.o_lives > 9)
+ fprintf( settingsFile, "o_lives=%d\n", settings.o_lives );
- fprintf( settingsFile, "mus_volume=%d\n", localsettings.mus_volume );
- fprintf( settingsFile, "sfx_volume=%d\n", localsettings.sfx_volume );
- fprintf( settingsFile, "menu_music=%d\n", localsettings.menu_music );
+ fprintf( settingsFile, "mus_volume=%d\n", settings.mus_volume );
+ fprintf( settingsFile, "sfx_volume=%d\n", settings.sfx_volume );
+ fprintf( settingsFile, "menu_music=%d\n", settings.menu_music );
+ fprintf( settingsFile, "fullscreen=%d\n", settings.fullscreen);
- if (screen->flags & SDL_FULLSCREEN){
- fprintf( settingsFile, "window=%s\n", "no" );
- } else {
- fprintf( settingsFile, "window=%s\n", "yes" );
- }
+
+// if (screen->flags & SDL_FULLSCREEN){
+// fprintf( settingsFile, "fullscreen=%s\n", "1");
+// } else {
+// fprintf( settingsFile, "fullscreen=%s\n", "0");
+// }
fclose( settingsFile );
}
Modified: tuxtype/trunk/tuxtype/theme.c
===================================================================
--- tuxtype/trunk/tuxtype/theme.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/theme.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -28,14 +28,14 @@
DATA_PREFIX"/share/"PACKAGE"/data"
};
-SDL_Surface *letters[255] = { NULL };
+SDL_Surface *letters[255] = {NULL};
wchar_t ALPHABET[256];
-wchar_t KEYMAP[256];
unsigned char FINGER[256][10];
int ALPHABET_SIZE;
unsigned char realPath[2][FNLEN];
char themeName[FNLEN];
-int useEnglish;
+char fontName[FNLEN];
+//int useEnglish;
#define MAX_LANGUAGES 100
@@ -44,25 +44,28 @@
* the paths that the loaders use. It will set a variable
* numPaths = 1 or 2. 1 if we are just using the default,
* 2 if there are two themes. Then it will edit the varible
- * Paths[]. It will always put the theme path first, then
+ * realPaths[]. It will always put the theme path first, then
* the default path
*/
-void SetupTheme(const char *dirName)
+
+/*FIXME should check for 'font_name' file, get name and change to requested font */
+
+void SetupTheme(const char* dirName)
{
int i;
int found = 0;
- useEnglish=1; // default is to use English if we cannot find theme
+ settings.use_english=1; // default is to use English if we cannot find theme
for (i=0; i<NUM_PATHS && !found; i++) {
DEBUGCODE{
- fprintf(stderr, "setupTheme(): checking for: %s\n", PATHS[i]);
+ fprintf(stderr, "SetupTheme(): checking for: %s\n", PATHS[i]);
}
if (CheckFile(PATHS[i]))
{
- strncpy( realPath[1], PATHS[i], FNLEN-1);
- strncpy( themeName, "", FNLEN-1 );
+ strncpy(realPath[1], PATHS[i], FNLEN - 1);
+ strncpy(themeName, "", FNLEN - 1);
found = 1; /* so quit looking */
DEBUGCODE{
@@ -85,14 +88,14 @@
if (CheckFile(fullDir))
{
- useEnglish=0;
+ settings.use_english=0;
strncpy( realPath[0], fullDir, FNLEN-1 );
strncpy( themeName, dirName, FNLEN-1 );
}
}
DEBUGCODE
{
- fprintf(stderr, "Leaving setupTheme():\n");
+ fprintf(stderr, "Leaving SetupTheme():\n");
if (dirName != NULL)
fprintf(stderr, "realPath[0] = %s\n", realPath[0]);
fprintf(stderr, "realPath[1] = %s\n", realPath[1]);
@@ -119,14 +122,14 @@
unsigned char themeNames[MAX_LANGUAGES][FNLEN];
unsigned char themePaths[MAX_LANGUAGES][FNLEN];
- int old_useEnglish;
+ int old_use_english;
char old_realPath[FNLEN];
DIR *themesDir;
struct dirent *themesFile;
// struct stat fileStats;
- old_useEnglish = useEnglish;
+ old_use_english = settings.use_english;
strncpy( old_realPath, realPath[0], FNLEN-1 );
sprintf( fn, "%s/themes/", realPath[1]);
@@ -163,9 +166,9 @@
closedir(themesDir);
- useEnglish = 1;
+ settings.use_english = 1;
// HACK: is font empty now???
- font = LoadFont( ttf_font, ttf_font_size );
+ font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);
titles[0] = BlackOutline( "English", font, &white );
select[0] = BlackOutline( "English", font, &yellow);
@@ -184,7 +187,7 @@
TTF_CloseFont(font);
- useEnglish = old_useEnglish;
+ settings.use_english = old_use_english;
bkg = LoadImage("main_bkg.png", IMG_REGULAR);
@@ -246,7 +249,7 @@
break;
case SDL_KEYDOWN:
if (event.key.keysym.sym == SDLK_ESCAPE) {
- useEnglish = old_useEnglish;
+ settings.use_english = old_use_english;
strncpy( realPath[0], old_realPath, FNLEN-1 );
stop = 1;
break;
Modified: tuxtype/trunk/tuxtype/titlescreen.c
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.c 2007-07-20 15:07:53 UTC (rev 192)
+++ tuxtype/trunk/tuxtype/titlescreen.c 2007-08-01 23:02:27 UTC (rev 193)
@@ -38,7 +38,6 @@
int menu_depth; // how deep we are in the menu
int menu_sound; // status of menu sound effects
int menu_music; // status of menu sound effects
-settings localsettings;
/* --- other media --- */
SDL_Surface *title;
@@ -100,10 +99,10 @@
char phrase[128];
- if (sys_sound)
+ if (settings.sys_sound)
{
- menu_sound=1;
- menu_music=localsettings.menu_music;
+ menu_sound = 1;
+ menu_music = settings.menu_music;
}
@@ -116,7 +115,7 @@
* StandbyScreen: Display the Standby screen....
*/
- if (show_tux4kids)
+ if (settings.show_tux4kids)
{
SDL_Surface *standby;
standby = LoadImage("standby.png", IMG_REGULAR|IMG_NO_THEME);
@@ -161,13 +160,13 @@
/* --- wait if the first time in the game --- */
- if (show_tux4kids)
+ if (settings.show_tux4kids)
{
while ((SDL_GetTicks() - start) < 2000)
{
SDL_Delay(50);
}
- show_tux4kids = 0;
+ settings.show_tux4kids = 0;
}
SDL_ShowCursor(1);
@@ -740,7 +739,7 @@
{
if (key_menu != old_key_menu)
{
- rewind(menu_gfx[key_menu][menu_depth]);
+ REWIND(menu_gfx[key_menu][menu_depth]);
PlaySound(snd_move);
}
@@ -749,7 +748,7 @@
SDL_BlitSurface(sel_text[key_menu][menu_depth], NULL, screen, &text_dst[key_menu]);
SDL_BlitSurface(menu_gfx[key_menu][menu_depth]->frame[menu_gfx[key_menu][menu_depth]->cur], NULL, screen, &menu_gfxdest[key_menu]);
- next_frame(menu_gfx[key_menu][menu_depth]);
+ NEXT_FRAME(menu_gfx[key_menu][menu_depth]);
}
@@ -788,14 +787,14 @@
LOG( "->>Freeing title screen images\n" );
- localsettings.menu_music=menu_music;
+ settings.menu_music = menu_music;
unload_media();
LOG( "->TitleScreen():END \n" );
}
-
+/* FIXME this should update settings.fullscreen */
void SwitchScreenMode(void)
{
SDL_Surface *tmp;
@@ -838,6 +837,7 @@
SDL_UpdateRect(tmp,0,0,RES_X,RES_Y);
SDL_FreeSurface(tmp);
+ settings.fullscreen = !settings.fullscreen;
}
@@ -949,35 +949,34 @@
static void load_media(void)
{
+ DEBUGCODE
+ {
+ fprintf(stderr, "Entering load_media():\n");
+ fprintf(stderr, "realPath[0] = %s\n", realPath[0]);
+ fprintf(stderr, "realPath[1] = %s\n", realPath[1]);
+ }
- /* --- load sounds --- */
- DEBUGCODE
- {
- fprintf(stderr, "Entering titlescreen_load_media():\n");
- fprintf(stderr, "realPath[0] = %s\n", realPath[0]);
- fprintf(stderr, "realPath[1] = %s\n", realPath[1]);
- }
-
- if (menu_sound){
- snd_move = LoadSound("tock.wav");
- snd_select = LoadSound("pop.wav");
- }
+ /* --- load sounds --- */
+ if (menu_sound)
+ {
+ snd_move = LoadSound("tock.wav");
+ snd_select = LoadSound("pop.wav");
+ }
- /* --- load graphics --- */
+ /* --- load graphics --- */
+ title = LoadImage( "title1.png", IMG_ALPHA );
+ speaker = LoadImage( "sound.png", IMG_ALPHA );
+ speakeroff = LoadImage( "nosound.png", IMG_ALPHA );
+ bkg = LoadImage( "main_bkg.png", IMG_REGULAR );
- title = LoadImage( "title1.png", IMG_ALPHA );
- speaker = LoadImage( "sound.png", IMG_ALPHA );
- speakeroff = LoadImage( "nosound.png", IMG_ALPHA );
- bkg = LoadImage( "main_bkg.png", IMG_REGULAR );
+ sel = LoadSprite("menu/sel", IMG_ALPHA);
+ reg = LoadSprite("menu/reg", IMG_ALPHA);
- sel = LoadSprite("menu/sel", IMG_ALPHA);
- reg = LoadSprite("menu/reg", IMG_ALPHA);
+ Tux = LoadSprite("tux", IMG_ALPHA);
- Tux = LoadSprite("tux", IMG_ALPHA);
-
- font = LoadFont( menu_font, menu_font_size );
- /* Should probably call this directly from TitleScreen() */
- load_menu();
+ font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);
+ /* Should probably call this directly from TitleScreen() */
+ load_menu();
}
static void unload_media(void)
@@ -1010,7 +1009,7 @@
SDL_Surface *s1, *s2, *s3, *s4;
sprite *tux;
SDL_Rect loc;
- int finished=0,i;
+ int finished = 0, i;
LOG( "NotImplemented() - creating text\n" );
@@ -1019,13 +1018,15 @@
s3 = BlackOutline( _("Discuss the future of TuxTyping at"), font, &white);
/* we always want the URL in english */
- if (!useEnglish) {
+ /* NOTE: all fonts are almost certain to include glyphs for ASCII, */
+ /* so the following "english_font" hackery is probably unnecessary: */
+ if (!settings.use_english) {
TTF_Font *english_font;
- useEnglish = 1;
- english_font = LoadFont( menu_font, menu_font_size );
+ settings.use_english = 1;
+ english_font = LoadFont(DEFAULT_MENU_FONT, MENU_FONT_SIZE);
s4 = BlackOutline( "http://tuxtype.sf.net/forums", english_font, &white);
TTF_CloseFont(english_font);
- useEnglish = 0;
+ settings.use_english = 0;
} else
s4 = BlackOutline( "http://tuxtype.sf.net/forums", font, &white);
@@ -1063,7 +1064,7 @@
}
i++;
if (i%5==0) {
- next_frame(tux);
+ NEXT_FRAME(tux);
SDL_BlitSurface( bkg, &loc, screen, &loc);
SDL_BlitSurface( tux->frame[tux->cur], NULL, screen, &loc);
SDL_UpdateRect(screen, loc.x, loc.y, loc.w, loc.h);
@@ -1112,8 +1113,8 @@
/* find the directory to load wordlists from */
- for (i=useEnglish; i<2; i++) {
- sprintf( wordPath, "%s/words", realPath[i] );
+ for (i = settings.use_english; i < 2; i++) {
+ sprintf(wordPath, "%s/words", realPath[i]);
if (CheckFile(wordPath))
break;
}
More information about the Tux4kids-commits
mailing list