[Tux4kids-commits] r122 - in tuxtype/trunk: . nsis tuxtype
tuxtype/data tuxtype/data/images
tuxtype/data/images/backgrounds tuxtype/data/images/cities
tuxtype/data/images/comets tuxtype/data/images/hands
tuxtype/data/images/keyboard tuxtype/data/images/menu
tuxtype/data/images/status tuxtype/data/images/tux
tuxtype/data/scripts tuxtype/data/sounds tuxtype/data/themes
tuxtype/data/themes/armenian tuxtype/data/themes/armenian/images
tuxtype/data/themes/bokmal tuxtype/data/themes/bokmal/images
tuxtype/data/themes/bokmal/images/status
tuxtype/data/themes/bokmal/words tuxtype/data/themes/catalan
tuxtype/data/themes/catalan/words tuxtype/data/themes/dansk
tuxtype/data/themes/dansk/sounds
tuxtype/data/themes/dansk/words tuxtype/data/themes/deutsch
tuxtype/data/themes/deutsch/words tuxtype/data/themes/espanol
tuxtype/data/themes/espanol/images
tuxtype/data/themes/espanol/words tuxtype/data/themes/euskara
tuxtype/data/themes/euskara/images
tuxtype/data/themes/euskara/words tuxtype/data/themes/french
tuxtype/data/themes/french/words tuxtype/data/themes/greek
tuxtype/data/themes/greek/words tuxtype/data/themes/italian
tuxtype/data/themes/italian/words tuxtype/data/themes/jamaican
tuxtype/data/themes/jamaican/images
tuxtype/data/themes/jamaican/words tuxtype/data/themes/lithuanian
tuxtype/data/themes/lithuanian/images
tuxtype/data/themes/lithuanian/images/status
tuxtype/data/themes/lithuanian/sounds
tuxtype/data/themes/lithuanian/words tuxtype/data/themes/nederlands
tuxtype/data/themes/nederlands/words tuxtype/data/themes/nynorsk
tuxtype/data/themes/nynorsk/images
tuxtype/data/themes/nynorsk/images/status
tuxtype/data/themes/nynorsk/words tuxtype/data/themes/russian
tuxtype/data/themes/russian/images
tuxtype/data/themes/russian/images/status
tuxtype/data/themes/russian/words tuxtype/data/themes/svenska
tuxtype/data/themes/svenska/words tuxtype/data/themes/swahili
tuxtype/data/themes/swahili/words tuxtype/data/words
tuxtype/docs tuxtype/docs/en
dbruce at alioth.debian.org
dbruce at alioth.debian.org
Thu Mar 8 21:54:57 CET 2007
Author: dbruce
Date: 2006-11-17 11:14:10 +0000 (Fri, 17 Nov 2006)
New Revision: 122
Added:
tuxtype/trunk/README-CROSSBUILD.txt
tuxtype/trunk/cross-configure.sh
tuxtype/trunk/cross-make.sh
tuxtype/trunk/nsis/
tuxtype/trunk/nsis/tuxtype.nsi.in
Modified:
tuxtype/trunk/Makefile.am
tuxtype/trunk/Makefile.in
tuxtype/trunk/config.h.in
tuxtype/trunk/configure
tuxtype/trunk/configure.in
tuxtype/trunk/tuxtype/Makefile.in
tuxtype/trunk/tuxtype/alphabet.c
tuxtype/trunk/tuxtype/data/Makefile.in
tuxtype/trunk/tuxtype/data/images/Makefile.in
tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in
tuxtype/trunk/tuxtype/data/images/cities/Makefile.in
tuxtype/trunk/tuxtype/data/images/comets/Makefile.in
tuxtype/trunk/tuxtype/data/images/hands/Makefile.in
tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in
tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
tuxtype/trunk/tuxtype/data/images/status/Makefile.in
tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
tuxtype/trunk/tuxtype/data/scripts/Makefile.in
tuxtype/trunk/tuxtype/data/sounds/Makefile.in
tuxtype/trunk/tuxtype/data/themes/Makefile.in
tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in
tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in
tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in
tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in
tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in
tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in
tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in
tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in
tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in
tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in
tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in
tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in
tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in
tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in
tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in
tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in
tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in
tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in
tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in
tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in
tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in
tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in
tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in
tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in
tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in
tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in
tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in
tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in
tuxtype/trunk/tuxtype/data/words/Makefile.in
tuxtype/trunk/tuxtype/docs/Makefile.in
tuxtype/trunk/tuxtype/docs/en/Makefile.in
tuxtype/trunk/tuxtype/funcs.h
tuxtype/trunk/tuxtype/laser.c
tuxtype/trunk/tuxtype/loaders.c
tuxtype/trunk/tuxtype/main.c
tuxtype/trunk/tuxtype/playgame.c
tuxtype/trunk/tuxtype/playgame.h
tuxtype/trunk/tuxtype/practice.c
tuxtype/trunk/tuxtype/setup.c
tuxtype/trunk/tuxtype/theme.c
tuxtype/trunk/tuxtype/titlescreen.c
tuxtype/trunk/tuxtype/titlescreen.h
Log:
Cross build support
Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/Makefile.am 2006-11-17 11:14:10 UTC (rev 122)
@@ -1,3 +1,5 @@
+# Modified to include support for NSIS Windows installer - David Bruce <dbruce at tampabay.rr.com>
+MAKENSIS=@NSIS@
SUBDIRS = tuxtype
@@ -47,3 +49,34 @@
rpm: $(PACKAGE)-$(VERSION).tar.gz
rpm -ta $(PACKAGE)-$(VERSION).tar.gz
+# Rules needed to cross-build nsis Win32 installer under Linux
+# Taken from tuxmath's Makefile.am - David Bruce
+# This rule probably kludgy (hardcoded)- DSB
+install-nsi-local: all
+ $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/data;
+ $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/docs;
+
+ (cd $(top_srcdir)/tuxtype/data ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude \ "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" --exclude "*.svn*" * ) \
+ | ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/data ; tar xf -) ; \
+ (cd $(top_srcdir)/tuxtype/docs ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude \ "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" --exclude "*.svn*" * ) \
+ | ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/docs ; tar xf -) ; \
+ cp $(top_srcdir)/COPYING $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/COPYING.txt ; \
+ cp $(top_srcdir)/AUTHORS $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/AUTHORS.txt ; \
+ cp $(top_srcdir)/INSTALL $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/INSTALL.txt ; \
+ cp $(top_srcdir)/README $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/README.txt ; \
+ cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR) ; \
+ cp $(NSI_DLL_DIR)/*.ttf $(top_srcdir)/$(NSI_INSTALL_DIR)/data/fonts ; \
+ cp $(SUBDIRS)/tuxtype.exe $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxType2.exe ;
+
+
+install-nsi-am: install-nsi-local
+
+nsis: install-nsi-local
+ $(MAKENSIS) -NOCD nsis/tuxtype.nsi
+
+
+clean-local:
+ @$(NORMAL_CLEAN)
+ if test -d $(NSI_INSTALL_DIR); then \
+ rm -fr $(NSI_INSTALL_DIR); \
+ fi
\ No newline at end of file
Modified: tuxtype/trunk/Makefile.in
===================================================================
--- tuxtype/trunk/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -38,9 +38,10 @@
target_triplet = @target@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/tuxtype.spec.in $(top_srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL TODO config.guess config.sub depcomp \
- install-sh missing mkinstalldirs
+ $(srcdir)/tuxtype.spec.in $(top_srcdir)/configure \
+ $(top_srcdir)/nsis/tuxtype.nsi.in AUTHORS COPYING ChangeLog \
+ INSTALL TODO config.guess config.sub depcomp install-sh \
+ missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -51,7 +52,7 @@
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = tuxtype.spec
+CONFIG_CLEAN_FILES = tuxtype.spec nsis/tuxtype.nsi
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -82,6 +83,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -109,6 +112,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -124,6 +132,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -174,6 +183,9 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+
+# Modified to include support for NSIS Windows installer - David Bruce <dbruce at tampabay.rr.com>
+MAKENSIS = @NSIS@
SUBDIRS = tuxtype
EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype.ico autogen.sh
@@ -235,6 +247,8 @@
-rm -f config.h stamp-h1
tuxtype.spec: $(top_builddir)/config.status $(srcdir)/tuxtype.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+nsis/tuxtype.nsi: $(top_builddir)/config.status $(top_srcdir)/nsis/tuxtype.nsi.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
@@ -372,7 +386,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/.
+ $(mkdir_p) $(distdir)/. $(distdir)/nsis
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -542,7 +556,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -592,7 +606,7 @@
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-recursive ctags \
+ check-am clean clean-generic clean-local clean-recursive ctags \
ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
dist-tarZ dist-zip distcheck distclean distclean-generic \
distclean-hdr distclean-recursive distclean-tags \
@@ -646,6 +660,36 @@
# Rule to build RPM distribution package
rpm: $(PACKAGE)-$(VERSION).tar.gz
rpm -ta $(PACKAGE)-$(VERSION).tar.gz
+
+# Rules needed to cross-build nsis Win32 installer under Linux
+# Taken from tuxmath's Makefile.am - David Bruce
+# This rule probably kludgy (hardcoded)- DSB
+install-nsi-local: all
+ $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/data;
+ $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/docs;
+
+ (cd $(top_srcdir)/tuxtype/data ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude \ "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" --exclude "*.svn*" * ) \
+ | ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/data ; tar xf -) ; \
+ (cd $(top_srcdir)/tuxtype/docs ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude \ "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" --exclude "*.svn*" * ) \
+ | ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/docs ; tar xf -) ; \
+ cp $(top_srcdir)/COPYING $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/COPYING.txt ; \
+ cp $(top_srcdir)/AUTHORS $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/AUTHORS.txt ; \
+ cp $(top_srcdir)/INSTALL $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/INSTALL.txt ; \
+ cp $(top_srcdir)/README $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/README.txt ; \
+ cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR) ; \
+ cp $(NSI_DLL_DIR)/*.ttf $(top_srcdir)/$(NSI_INSTALL_DIR)/data/fonts ; \
+ cp $(SUBDIRS)/tuxtype.exe $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxType2.exe ;
+
+install-nsi-am: install-nsi-local
+
+nsis: install-nsi-local
+ $(MAKENSIS) -NOCD nsis/tuxtype.nsi
+
+clean-local:
+ @$(NORMAL_CLEAN)
+ if test -d $(NSI_INSTALL_DIR); then \
+ rm -fr $(NSI_INSTALL_DIR); \
+ fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Added: tuxtype/trunk/README-CROSSBUILD.txt
===================================================================
--- tuxtype/trunk/README-CROSSBUILD.txt 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/README-CROSSBUILD.txt 2006-11-17 11:14:10 UTC (rev 122)
@@ -0,0 +1,87 @@
+Building TuxType for Windows on a Debian System:
+------------------------------------------------
+
+David Bruce <dbruce at tampabay.rr.com>
+
+TuxType can be cross-built for Windows on a Debian (or probably nearly
+any Linux or Unix) system. The process closely follows the work done
+by Yves Combe <yves at ycombe.net> for a cross-build of TuxMath. I adapted
+the TuxType svn source as follows to get this to work:
+
+
+- Copied cross-configure.sh and cross-make.sh from tuxmath unmodified.
+- Modified configure.in to check for mingw32 build.
+- Copied nsis/tuxtype.nsi.in from tuxmath's nsis/tuxmath.nsi.in with
+ very minor modifications (basically different program name).
+- Modified Makefile.am by adding code from tuxmath's Makefile.am to
+ support nsis installer as makefile target, with some modifications.
+- Minor changes to tuxtype's C source code:
+ - Added local function prototype for print_at() in practice.c.
+ - Several additional debugging output statements added.
+ - int_rand() as defined in playgame.c did not work correctly in
+ Windows, replaced using rand() % in several locations.
+ - WORD_qty counter didn't work right under Windows (could not
+ figure out why!), added simple code to count words in list
+ within WORDS_use() rather than rely on counter.
+
+Before the crossbuild can be done, you need to get the environment prepared.
+(Below taken from Tuxmath docs with very slight editing)
+
+ To set up a crossbuild environment:
+
+ 1. Install mingw32 (apt-get install mingw32) and makensis (apt-get install nsis)
+
+ 2. Create directory structure:
+ - mkdir /usr/local/cross-tools
+ - mkdir /usr/local/cross-tools/i586-mingw32msvc
+ - mkdir /usr/local/cross-tools/i586-mingw32msvc/lib
+ - mkdir /usr/local/cross-tools/i586-mingw32msvc/include
+
+ 3. Install precompiled win32 dev files (lib and includes) for SDL, SDL-image
+ and SDL-mixer in the lib and include directories you just created.
+ You can get all of these from www.libsdl.org. I had some trouble with
+ this step as the SDL libs have varieties intended for both mingw32 and MSVC -
+ I was able to build successfully using the mingw32 ones. I also had to put
+ all the lib files directly under /usr/local/cross-tools/i586-mingw32msvc/lib
+ to get it to work. My /usr/local/cross-tools/i586-mingw32msvc/lib contains:
+
+ dbruce at debian:/usr/local/cross-tools/i586-mingw32msvc/lib$ ls
+ SDL_image.dll jpeg.dll libgw32c.a smpeg.dll
+ SDL_image.lib libSDL.dll.a libpng12.dll vorbis.dll
+ SDL_mixer.dll libSDL.la libtiff.dll vorbisfile.dll
+ SDL_mixer.lib libSDLmain.a ogg.dll zlib1.dll
+
+ The header files can be in their own folders as long as they are under
+ /usr/local/cross-tools/i586-mingw32msvc/include
+
+ 4. Install libgw32c (the dev file):
+ http://gnuwin32.sourceforge.net/packages/libgw32c.htm in the same directory.
+ This gives you the file "libgw32c.a" that you need to have in the lib directory.
+
+ 5. You need to have a directory containing all of the dlls that will need to be
+ packaged into the installer. The Makefile expects them to be in NSI_DLL_DIR,
+ which is set to ~/tuxtype_dll. The directory also needs to contain the
+ Gentium font file. On my machine, I have:
+
+ dbruce at debian:~/tuxtype_dll$ ls
+ GenAI102.ttf SDL.dll jpeg.dll smpeg.dll
+ GenAR102.ttf SDL_image.dll libpng12.dll vorbis.dll
+ GenI102.ttf SDL_mixer.dll libtiff.dll vorbisfile.dll
+ GenR102.ttf SDL_ttf.dll ogg.dll zlib1.dll
+
+
+ (Note - this has mostly the same files as the cross-tools lib directory - it is most
+ likely possible to eliminate this redundancy in some way.).
+
+ 6. If you have done a native (Linux) build in the same source tree, run "make clean"
+ and "make distclean" to get rid of the autogenerated files.
+
+ 7. From the trunk dir, run:
+ ./autogen.sh
+ ./cross-configure.sh --with-sdl-prefix
+ ./cross-make.sh
+ ./cross-make.sh nsis
+
+ You should now have the installer (something like "tuxtype-1.5.6-win32-installer.exe")
+ in the trunk directory. Execute the installer on the target Windows machine to install
+ the program.
\ No newline at end of file
Modified: tuxtype/trunk/config.h.in
===================================================================
--- tuxtype/trunk/config.h.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/config.h.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.in by autoheader. */
+/* Native MinGW32 build */
+#undef BUILD_MINGW32
+
/* Define to 1 if you have the `atexit' function. */
#undef HAVE_ATEXIT
Modified: tuxtype/trunk/configure
===================================================================
--- tuxtype/trunk/configure 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/configure 2006-11-17 11:14:10 UTC (rev 122)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for tuxtype 1.5.6.
+# Generated by GNU Autoconf 2.60a for tuxtype 1.5.6.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -566,36 +566,36 @@
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
#endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -696,8 +696,16 @@
SDL_CONFIG
SDL_CFLAGS
SDL_LIBS
+BUILD_MINGW32_TRUE
+BUILD_MINGW32_FALSE
+WINDRES
GREP
EGREP
+NSI_INSTALL_DIR
+NSI_BUILD_TRUE
+NSI_BUILD_FALSE
+NSI_DLL_DIR
+NSIS
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -1301,6 +1309,9 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-sdl-prefix=PFX Prefix where SDL is installed (optional)
--with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
+ --with-dll-directory=path
+ set the path where dll for TuxType are
+ $(NSI_DLL_DIR)
Some influential environment variables:
CXX C++ compiler command
@@ -1377,7 +1388,7 @@
if $ac_init_version; then
cat <<\_ACEOF
tuxtype configure 1.5.6
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.60a
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1391,7 +1402,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by tuxtype $as_me 1.5.6, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -2544,7 +2555,7 @@
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -2572,6 +2583,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2583,8 +2600,6 @@
fi
ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
@@ -4445,6 +4460,8 @@
+
+
# Check whether --with-sdl-prefix was given.
if test "${with_sdl_prefix+set}" = set; then
withval=$with_sdl_prefix; sdl_prefix="$withval"
@@ -4746,7 +4763,7 @@
echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
@@ -4835,7 +4852,7 @@
ac_cv_lib_SDL_image_IMG_Load=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+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
@@ -4926,7 +4943,7 @@
ac_cv_lib_SDL_mixer_Mix_PlayMusic=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+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
@@ -5017,7 +5034,7 @@
ac_cv_lib_SDL_ttf_TTF_Init=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+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
@@ -5037,6 +5054,92 @@
fi
+#
+SDL_CFLAGS=`sdl-config --cflags`
+CFLAGS="$CFLAGS $SDL_CFLAGS"
+
+SDL_LIBS=`sdl-config --libs`
+LIBS="$SDL_LIBS $LIBS"
+
+# Check platform - see if see if building for Windows:
+{ echo "$as_me:$LINENO: checking for native Win32" >&5
+echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; }
+case "$host" in
+ *-*-mingw*)
+ native_win32=yes
+ ;;
+ *)
+ native_win32=no
+ ;;
+esac
+{ echo "$as_me:$LINENO: result: $native_win32" >&5
+echo "${ECHO_T}$native_win32" >&6; }
+
+
+
+if test "$native_win32" = yes; then
+ BUILD_MINGW32_TRUE=
+ BUILD_MINGW32_FALSE='#'
+else
+ BUILD_MINGW32_TRUE='#'
+ BUILD_MINGW32_FALSE=
+fi
+
+
+if test "$native_win32" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define BUILD_MINGW32 1
+_ACEOF
+
+ CFLAGS="$CFLAGS -D__GW32__"
+ LIBS="-lmingw32 -lSDLmain $LIBS -lgw32c -luuid -lole32 -lwsock32 -mwindows"
+ CPPFLAGS="$CPPFLAGS -idirafter $prefix/include/glibc"
+ #CPPFLAGS="$CPPFLAGS -I$prefix/include/glibc"
+ # Extract the first word of ""$target_alias-windres"", so it can be a program name with args.
+set dummy "$target_alias-windres"; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_WINDRES+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $WINDRES in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_WINDRES="$WINDRES" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_WINDRES="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_WINDRES" && ac_cv_path_WINDRES="no"
+ ;;
+esac
+fi
+WINDRES=$ac_cv_path_WINDRES
+if test -n "$WINDRES"; then
+ { echo "$as_me:$LINENO: result: $WINDRES" >&5
+echo "${ECHO_T}$WINDRES" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+
+
# Checks for header files.
{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
@@ -5664,10 +5767,10 @@
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
- const charset x;
+ const charset cs;
/* SunOS 4.1.1 cc rejects this. */
- char const *const *ccp;
- char **p;
+ char const *const *pcpcc;
+ char **ppc;
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
@@ -5676,11 +5779,11 @@
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
- ccp = &g + (g ? g-g : 0);
+ pcpcc = &g + (g ? g-g : 0);
/* HPUX 7.0 cc rejects these. */
- ++ccp;
- p = (char**) ccp;
- ccp = (char const *const *) p;
+ ++pcpcc;
+ ppc = (char**) pcpcc;
+ pcpcc = (char const *const *) ppc;
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
@@ -5707,7 +5810,7 @@
const int foo = 10;
if (!foo) return 0;
}
- return !x[0] && !zero.x;
+ return !cs[0] && !zero.x;
#endif
;
@@ -5956,7 +6059,7 @@
eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
@@ -5971,19 +6074,93 @@
done
-#
-SDL_CFLAGS=`sdl-config --cflags`
-CFLAGS="$CFLAGS $SDL_CFLAGS"
-SDL_LIBS=`sdl-config --libs`
-LIBS="$SDL_LIBS $LIBS"
+
+
# Sam's Install Kludge-work
CPPFLAGS="$CPPFLAGS -DDATA_PREFIX=\\\"\$(prefix)\\\""
ac_config_files="$ac_config_files Makefile tuxtype/Makefile tuxtype/data/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/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/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):
+NSI_INSTALL_DIR=mingw32
+
+
+NSI_DLL_DIR=~/tuxtype_dll
+
+# Check whether --with-dll-directory was given.
+if test "${with_dll_directory+set}" = set; then
+ withval=$with_dll_directory; dll_path=$withval
+else
+ dll_path=no
+fi
+
+
+
+
+if test "$dll_path" = no; then
+ NSI_BUILD_TRUE=
+ NSI_BUILD_FALSE='#'
+else
+ NSI_BUILD_TRUE='#'
+ NSI_BUILD_FALSE=
+fi
+
+
+if test $dll_path != no; then
+NSI_DLL_DIR=$dll_path
+fi
+
+
+
+# Extract the first word of "makensis", so it can be a program name with args.
+set dummy makensis; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_NSIS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $NSIS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_NSIS="$NSIS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_NSIS="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_NSIS" && ac_cv_path_NSIS="no"
+ ;;
+esac
+fi
+NSIS=$ac_cv_path_NSIS
+if test -n "$NSIS"; then
+ { echo "$as_me:$LINENO: result: $NSIS" >&5
+echo "${ECHO_T}$NSIS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+# FIXME should this go into earlier AC_CONFIG_FILES ?
+ac_config_files="$ac_config_files nsis/tuxtype.nsi"
+
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -6101,6 +6278,20 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${BUILD_MINGW32_TRUE}" && test -z "${BUILD_MINGW32_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_MINGW32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_MINGW32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${NSI_BUILD_TRUE}" && test -z "${NSI_BUILD_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"NSI_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"NSI_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -6389,7 +6580,7 @@
# values after options handling.
ac_log="
This file was extended by tuxtype $as_me 1.5.6, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6418,7 +6609,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -6442,7 +6633,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
tuxtype config.status 1.5.6
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.60a,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -6622,6 +6813,7 @@
"tuxtype/docs/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/docs/Makefile" ;;
"tuxtype/docs/en/Makefile") CONFIG_FILES="$CONFIG_FILES tuxtype/docs/en/Makefile" ;;
"tuxtype.spec") CONFIG_FILES="$CONFIG_FILES tuxtype.spec" ;;
+ "nsis/tuxtype.nsi") CONFIG_FILES="$CONFIG_FILES nsis/tuxtype.nsi" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -6822,13 +7014,21 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+BUILD_MINGW32_TRUE!$BUILD_MINGW32_TRUE$ac_delim
+BUILD_MINGW32_FALSE!$BUILD_MINGW32_FALSE$ac_delim
+WINDRES!$WINDRES$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
+NSI_INSTALL_DIR!$NSI_INSTALL_DIR$ac_delim
+NSI_BUILD_TRUE!$NSI_BUILD_TRUE$ac_delim
+NSI_BUILD_FALSE!$NSI_BUILD_FALSE$ac_delim
+NSI_DLL_DIR!$NSI_DLL_DIR$ac_delim
+NSIS!$NSIS$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -7419,3 +7619,4 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
+
Modified: tuxtype/trunk/configure.in
===================================================================
--- tuxtype/trunk/configure.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/configure.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -25,6 +25,8 @@
# Check for SDL
SDL_VERSION=1.2.5
+
+
AM_PATH_SDL($SDL_VERSION,
:,
AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
@@ -33,6 +35,37 @@
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, )])
+#
+SDL_CFLAGS=`sdl-config --cflags`
+CFLAGS="$CFLAGS $SDL_CFLAGS"
+
+SDL_LIBS=`sdl-config --libs`
+LIBS="$SDL_LIBS $LIBS"
+
+# Check platform - see if see if building for Windows:
+AC_MSG_CHECKING([for native Win32])
+case "$host" in
+ *-*-mingw*)
+ native_win32=yes
+ ;;
+ *)
+ native_win32=no
+ ;;
+esac
+AC_MSG_RESULT([$native_win32])
+
+AM_CONDITIONAL(BUILD_MINGW32, test "$native_win32" = yes)
+
+if test "$native_win32" = yes; then
+ AC_DEFINE([BUILD_MINGW32], 1,[Native MinGW32 build])
+ CFLAGS="$CFLAGS -D__GW32__"
+ LIBS="-lmingw32 -lSDLmain $LIBS -lgw32c -luuid -lole32 -lwsock32 -mwindows"
+ CPPFLAGS="$CPPFLAGS -idirafter $prefix/include/glibc"
+ #CPPFLAGS="$CPPFLAGS -I$prefix/include/glibc"
+ AC_PATH_PROG(WINDRES, "$target_alias-windres", no, [$PATH])
+fi
+
+
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h])
@@ -44,13 +77,10 @@
# Checks for library functions.
AC_CHECK_FUNCS([atexit memset strchr strstr malloc])
-#
-SDL_CFLAGS=`sdl-config --cflags`
-CFLAGS="$CFLAGS $SDL_CFLAGS"
-SDL_LIBS=`sdl-config --libs`
-LIBS="$SDL_LIBS $LIBS"
+
+
# Sam's Install Kludge-work
CPPFLAGS="$CPPFLAGS -DDATA_PREFIX=\\\"\$(prefix)\\\""
@@ -121,4 +151,29 @@
tuxtype/docs/en/Makefile
tuxtype.spec])
+# Support for building NSIS Win32 installer (adapted from TuxMath NSIS):
+NSI_INSTALL_DIR=mingw32
+AC_SUBST(NSI_INSTALL_DIR)
+
+NSI_DLL_DIR=~/tuxtype_dll
+AC_ARG_WITH(dll-directory,AC_HELP_STRING(
+ [--with-dll-directory=path],
+ [set the path where dll for TuxType are [$(NSI_DLL_DIR)]]), dll_path=$withval, dll_path=no)
+
+AM_CONDITIONAL(NSI_BUILD, test "$dll_path" = no)
+
+if test $dll_path != no; then
+NSI_DLL_DIR=$dll_path
+fi
+AC_SUBST(NSI_DLL_DIR)
+
+
+AC_PATH_PROG(NSIS, makensis, no, [$PATH])
+
+# FIXME should this go into earlier AC_CONFIG_FILES ?
+AC_CONFIG_FILES([
+nsis/tuxtype.nsi
+])
+
AC_OUTPUT
+
Added: tuxtype/trunk/cross-configure.sh
===================================================================
--- tuxtype/trunk/cross-configure.sh 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/cross-configure.sh 2006-11-17 11:14:10 UTC (rev 122)
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+CONFIG_SHELL=/bin/sh
+export CONFIG_SHELL
+PREFIX=/usr/local/cross-tools
+TARGET=i586-mingw32msvc
+PATH="$PREFIX/bin:$PREFIX/$TARGET/bin:$PATH"
+export PATH
+if [ -f "$PREFIX/$TARGET/bin/$TARGET-sdl-config" ]; then
+ SDL_CONFIG="$PREFIX/$TARGET/bin/$TARGET-sdl-config"
+ export SDL_CONFIG
+fi
+cache=cross-config.cache
+CPPFLAGS=-I$PREFIX/$TARGET/include LDFLAGS=-L$PREFIX/$TARGET/lib sh configure --cache-file="$cache" \
+ --target=$TARGET --host=$TARGET --build=i386-linux --prefix="$PREFIX/$TARGET" \
+ $*
+status=$?
+rm -f "$cache"
+exit $status
Property changes on: tuxtype/trunk/cross-configure.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: tuxtype/trunk/cross-make.sh
===================================================================
--- tuxtype/trunk/cross-make.sh 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/cross-make.sh 2006-11-17 11:14:10 UTC (rev 122)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+PREFIX=/usr/local/cross-tools
+TARGET=i386-mingw32msvc
+PATH="$PREFIX/bin:$PREFIX/$TARGET/bin:$PATH"
+export PATH
+exec make $*
Property changes on: tuxtype/trunk/cross-make.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: tuxtype/trunk/nsis/tuxtype.nsi.in
===================================================================
--- tuxtype/trunk/nsis/tuxtype.nsi.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/nsis/tuxtype.nsi.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -0,0 +1,108 @@
+# vim: noai et ts=4 tw=0
+# with a few tiny modifications by Phil Harper(philh at theopencd.org)
+# modified for tuxmath by Yves Combe (yves at ycombe.net)
+# modified for tuxtype by David Bruce (dbruce at tampabay.rr.com)
+
+!define PKG_VERSION "@VERSION@"
+!define PKG_PREFIX "tuxtype"
+
+!define APP_PREFIX "TuxType2"
+!define APP_EXE "${APP_PREFIX}.exe"
+!define APP_NAME "Tux Typing 2"
+
+OutFile "${PKG_PREFIX}-${PKG_VERSION}-win32-installer.exe"
+Name "${APP_NAME}"
+Caption ""
+CRCCheck on
+WindowIcon off
+BGGradient off
+
+# Default to not silent
+SilentInstall normal
+SilentUnInstall normal
+
+# Various default text options
+MiscButtonText
+InstallButtonText
+FileErrorText
+
+# Default installation dir and registry key of install directory
+InstallDir "$PROGRAMFILES\${APP_PREFIX}"
+InstallDirRegKey HKLM SOFTWARE\${APP_PREFIX} "Install_Dir"
+
+# Licence text
+LicenseText "You must agree to this license before installing ${APP_NAME}"
+LicenseData "mingw32\docs\COPYING.txt"
+
+# Directory browsing
+# DirShow show
+ComponentText "This will install ${APP_NAME} on your computer. Select which optional things you want installed."
+DirText "Choose a directory to install ${APP_NAME} in to:"
+AllowRootDirInstall false
+
+# Install page stuff
+InstProgressFlags smooth
+AutoCloseWindow true
+
+Section
+ SetOutPath $INSTDIR
+ File "mingw32\${APP_EXE}"
+ File "mingw32\*.dll"
+ SetOutPath $INSTDIR\data
+ File /r "mingw32\data\*.*"
+ SetOutPath $INSTDIR\docs
+ File /r "mingw32\docs\*.*"
+
+ WriteRegStr HKLM SOFTWARE\${APP_PREFIX} "Install_Dir" "$INSTDIR"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" "DisplayName" "${APP_NAME} (remove only)"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+ WriteUninstaller "uninstall.exe"
+SectionEnd
+
+
+Section "Start Menu Shortcuts"
+ SetShellVarContext all
+ SetOutPath $INSTDIR
+ CreateDirectory "$SMPROGRAMS\${APP_NAME}"
+ CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Full Screen).lnk" "$INSTDIR\${APP_EXE}" "-f" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxType2 in Fullscreen mode"
+ CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" "$INSTDIR\${APP_EXE}" "-w" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxType2 in a Window"
+ CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 "" "" "Remove Tux Typing 2"
+SectionEnd
+
+
+Section "Desktop Shortcut"
+ SetShellVarContext all
+ SetOutPath $INSTDIR
+ CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${APP_EXE}" "" "$INSTDIR\${APP_EXE}" 0 "" "" "Run Tux Typing 2"
+SectionEnd
+
+;Function .onInstSuccess
+; BringToFront
+; MessageBox MB_YESNO|MB_ICONQUESTION \
+; "${APP_NAME} was installed. Would you like to run ${APP_NAME} now ?" \
+; IDNO NoExec
+; Exec '$INSTDIR\${APP_EXE}'
+; NoExec:
+;FunctionEnd
+
+; uninstall stuff
+
+UninstallText "This will uninstall ${APP_NAME}. Hit 'Uninstall' to continue."
+
+; special uninstall section.
+Section "Uninstall"
+ SetShellVarContext all
+ ; remove registry keys
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}"
+ DeleteRegKey HKLM SOFTWARE\${APP_PREFIX}
+
+ RMDir /r "$INSTDIR\data"
+ RMDir /r "$INSTDIR\docs"
+ Delete "$INSTDIR\*.*"
+
+ Delete "$DESKTOP\${APP_NAME}.lnk"
+ Delete "$SMPROGRAMS\${APP_NAME}\*.*"
+ RMDir "$SMPROGRAMS\${APP_NAME}"
+SectionEnd
+
+
Modified: tuxtype/trunk/tuxtype/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -85,6 +85,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -112,6 +114,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -127,6 +134,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/alphabet.c 2006-11-17 11:14:10 UTC (rev 122)
@@ -28,6 +28,9 @@
SDL_Color white;
SDL_Color yellow;
+/* Used for word list functions (see below): */
+static int WORD_qty;
+unsigned char WORDS[MAX_NUM_WORDS][MAX_WORD_SIZE+1];
/* --- setup the alphabet --- */
void set_letters(unsigned char *t) {
@@ -203,7 +206,7 @@
static int last = -1; // we don't want to return same letter twice in a row
int letter;
do {
- letter = int_rand(0,255);
+ letter = rand() % 255;
} while ((letter == last && ALPHABET_SIZE > 1) || ALPHABET[letter] == 0);
last = letter;
@@ -215,9 +218,8 @@
* WORD FILE & DATA STRUCTURE *
******************************************************************************/
-int WORD_qty = 0;
-unsigned char WORDS[MAX_NUM_WORDS][MAX_WORD_SIZE+1];
+
/* WORDS_init: clears the number of words
*/
void WORDS_init( void ) {
@@ -229,29 +231,73 @@
*/
void WORDS_use_alphabet( void ) {
int i;
- WORD_qty=0;
- /* This totlly mucks up i18n abilities :( */
+
+ LOG("Entering WORDS_use_alphabet()\n");
+
+ WORD_qty = 0;
+ /* This totally mucks up i18n abilities :( */
for (i=65; i<90; i++)
+ {
if (ALPHABET[i]) {
WORDS[WORD_qty][0] = (unsigned char)i;
WORDS[WORD_qty][1] = '\0';
WORD_qty++;
+
+ DEBUGCODE { fprintf(stderr, "Adding %c\n", (unsigned char)i); }
}
+ }
+ /* Make sure list is terminated with null character */
+ WORDS[WORD_qty][0] = '\0';
+
+ DOUT(WORD_qty);
+ LOG("Leaving WORDS_use_alphabet()\n");
}
/* WORDS_get: returns a random word that wasn't returned
* the previous time (unless there is only 1 word!!!)
*/
unsigned char* WORDS_get( void ) {
- static int last_choice=-1;
+ static int last_choice = -1;
int choice;
+ LOG("Entering WORDS_get()\n");
+ DEBUGCODE { fprintf(stderr, "WORD_qty is: %d\n", WORD_qty); }
+
+ /* Now count list to make sure WORD_qty is correct: */
+
+ WORD_qty = 0;
+ while (WORDS[WORD_qty][0] != '\0')
+ {
+ WORD_qty++;
+ }
+
+ DEBUGCODE { fprintf(stderr, "After count, WORD_qty is: %d\n", WORD_qty); }
+
+ if (0 == WORD_qty)
+ {
+ LOG("No words in list\n");
+ return NULL;
+ }
+
+ if (WORD_qty > MAX_NUM_WORDS)
+ {
+ LOG("Error: WORD_qty greater than array size\n");
+ return NULL;
+ }
+
+ if (WORD_qty < 0)
+ {
+ LOG("Error: WORD_qty negative\n");
+ return NULL;
+ }
+
do {
- choice = int_rand( 0, WORD_qty );
- } while ((choice == last_choice) || WORD_qty < 2);
+ choice = (rand() % WORD_qty);
+ } while ((choice == last_choice) || (WORD_qty < 2));
last_choice = choice;
+ DEBUGCODE { fprintf(stderr, "Selected word is: %s\n", WORDS[choice]); }
return WORDS[choice];
}
@@ -266,6 +312,10 @@
unsigned char temp_word[FNLEN];
FILE *wordFile=NULL;
+ DEBUGCODE { fprintf(stderr, "Entering WORDS_use() for file: %s\n", wordFn); }
+
+ WORD_qty = 0;
+
/* --- open the file --- */
wordFile = fopen( wordFn, "r" );
@@ -285,6 +335,7 @@
/* ignore the title */
fscanf( wordFile, "%[^\n]\n", temp_word);
+
while (!feof(wordFile) && (WORD_qty < MAX_NUM_WORDS)) {
fscanf( wordFile, "%[^\n]\n", temp_word);
@@ -298,12 +349,22 @@
/* --- add word --- */
if (WORD_qty < MAX_NUM_WORDS)
- strcpy( WORDS[WORD_qty++], temp_word );
+ {
+ strcpy( WORDS[WORD_qty], temp_word );
+ WORD_qty++;
+ }
}
}
+
+ /* Make sure list is terminated with null character */
+ WORDS[WORD_qty][0] = '\0';
+ DOUT(WORD_qty);
+
if (WORD_qty == 0)
WORDS_use_alphabet( );
fclose(wordFile);
+
+ LOG("Leaving WORDS_use()\n");
}
Modified: tuxtype/trunk/tuxtype/data/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/images/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/images/cities/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/cities/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/images/cities/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/images/comets/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/comets/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/images/comets/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/images/hands/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/hands/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/images/hands/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/menu/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/images/menu/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/status/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/images/status/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/tux/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/images/tux/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/scripts/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/scripts/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/sounds/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/french/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/data/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/words/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/data/words/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/docs/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/docs/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/docs/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -66,6 +66,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -93,6 +95,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -108,6 +115,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/docs/en/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/docs/en/Makefile.in 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/docs/en/Makefile.in 2006-11-17 11:14:10 UTC (rev 122)
@@ -57,6 +57,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -84,6 +86,11 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,6 +106,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Modified: tuxtype/trunk/tuxtype/funcs.h
===================================================================
--- tuxtype/trunk/tuxtype/funcs.h 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/funcs.h 2006-11-17 11:14:10 UTC (rev 122)
@@ -16,8 +16,7 @@
* *
***************************************************************************/
-extern void SaveSettings( void );
-extern void LoadSettings( void );
+
extern int int_rand( int min, int max );
extern int max( int n1, int n2 );
extern SDL_Surface* ttf_letter( unsigned char ch, SDL_Color c );
@@ -70,11 +69,15 @@
extern Mix_Music *LoadMusic( char *datafile );
extern SDL_Surface *flip( SDL_Surface *in, int x, int y );
+
/* in setup.c */
extern void GraphicsInit( Uint32 video_flags );
extern void LibInit( Uint32 lib_flags );
-extern void InitEngine( void );
+extern void LoadSettings( void );
+extern void SaveSettings( void );
+extern void InitEngine( void ); /* NOT in setup.c */
+
/* in alphabet.c */
extern void LoadKeyboard( void );
extern void set_letters( unsigned char *t );
@@ -83,7 +86,7 @@
extern void show_letters( void );
extern SDL_Surface* black_outline( unsigned char *t, TTF_Font* font, SDL_Color* c );
-/* ### WORD FUNCTIONS */
+/* WORD FUNCTIONS (also in alphabet.c) */
extern void WORDS_init( void );
extern void WORDS_use_alphabet( void );
extern void WORDS_use( char *wordFn );
Modified: tuxtype/trunk/tuxtype/laser.c
===================================================================
--- tuxtype/trunk/tuxtype/laser.c 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/laser.c 2006-11-17 11:14:10 UTC (rev 122)
@@ -197,7 +197,8 @@
tux_same_counter = 0;
ans_num = 0;
- audioMusicPlay(musics[MUS_GAME + int_rand(0,3)], 0);
+ /* Next line changed to get rid of int_rand() which didn't work on win32: */
+ audioMusicPlay(musics[MUS_GAME + (rand() % NUM_MUSICS)], 0);
do {
@@ -288,10 +289,10 @@
/* 50% of the time.. */
- if (int_rand(0,2) == 0) {
+ if (0 == (rand() % 2)) {
/* ... pick an animation to play: */
- if (int_rand(0,2) == 0)
+ if (0 == (rand() % 2))
tux_anim = IMG_TUX_YES1;
else
tux_anim = IMG_TUX_YAY1;
@@ -309,7 +310,7 @@
playsound(sounds[SND_BUZZ]);
- if (int_rand(0,2)==0)
+ if (0 == (rand() % 2))
tux_img = IMG_TUX_DRAT;
else
tux_img = IMG_TUX_YIPE;
@@ -341,7 +342,7 @@
if (tux_pressing) {
while (tux_img == old_tux_img)
- tux_img = IMG_TUX_CONSOLE1 + int_rand(0,3);
+ tux_img = IMG_TUX_CONSOLE1 + (rand() % 3);
playsound(sounds[SND_CLICK]);
}
@@ -432,7 +433,7 @@
/* More comets to add during this wave! */
- if ((num_comets_alive < 2 || int_rand(0,4) == 0) && distanceMoved > 40) {
+ if ((num_comets_alive < 2 || ((rand() % 4) == 0)) && distanceMoved > 40) {
distanceMoved = 0;
laser_add_comet(DIF_LEVEL);
num_attackers--;
@@ -638,7 +639,7 @@
/* Keep playing music: */
if (sys_sound && !Mix_PlayingMusic())
- audioMusicPlay(musics[MUS_GAME + int_rand(0,3)], 0);
+ audioMusicPlay(musics[MUS_GAME + (rand() % NUM_MUSICS)], 0);
/* Pause (keep frame-rate event) */
@@ -678,16 +679,23 @@
comets[i].alive = 0;
/* Load diffrent random background image: */
+ LOG("Loading background in laser_reset_level()\n");
do {
- i = int_rand(0,NUM_BKGDS-1);
+ i = rand() % NUM_BKGDS; /* int_rand() didn't work correctly on win32 */
+ DOUT(i);
}
while (i == last_bkgd);
last_bkgd = i;
+ DOUT(i);
+
sprintf(fname, "backgrounds/%d.jpg", i);
+ LOG("Will try to load file:");
+ LOG(fname);
+
if (bkgd != NULL)
SDL_FreeSurface(bkgd);
@@ -713,9 +721,11 @@
case 1 : speed = 1 + (wave/4); num_attackers=15; break;
case 2 : speed = 1 + ((wave<<1)/3); num_attackers=(wave<<1); break;
case 3 : speed = 1 + wave; num_attackers=(wave<<1); break;
+ default: LOG("DIF_LEVEL not recognized!\n");
}
distanceMoved = 100; // so that we don't have to wait to start the level
+ LOG("Leaving laser_reset_level()\n");
}
@@ -726,71 +736,78 @@
int target, location = 0;
static int last = -1;
int targeted[NUM_CITIES] = { 0 };
- int add = int_rand(1,DIF_LEVEL+2);
+ int add = (rand() % (DIF_LEVEL + 2));
- DEBUGCODE { printf(" Adding %d comets \n", add); }
+ LOG ("Entering laser_add_comet()\n");
+ DEBUGCODE { fprintf(stderr, "Adding %d comets \n", add); }
- if (NUM_CITIES%2 == 0) {
- while ((add > 0) && (location != MAX_COMETS)) {
-
- /* Look for a free comet slot: */
- while ((comets[location].alive == 1) && (location < MAX_COMETS))
- location++;
+ if (0 == NUM_CITIES % 2) /* Even number of cities */
+ {
+ LOG("NUM_CITIES is even\n");
+ while ((add > 0) && (location != MAX_COMETS))
+ {
+ /* Look for a free comet slot: */
+ while ((comets[location].alive == 1) && (location < MAX_COMETS))
+ {
+ location++;
+ }
+ if (location < MAX_COMETS)
+ {
+ comets[location].alive = 1;
+ /* Pick a city to attack: */
+ do
+ {
+ target = (rand() % NUM_CITIES);
+ } while (target == last || targeted[target] == 1);
- if (location < MAX_COMETS) {
+ last = target;
+ targeted[target] = 1;
- comets[location].alive = 1;
+ /* Set comet to target that city: */
+ comets[location].city = target;
- /* Pick a city to attack: */
-
- do {
- target = int_rand( 0, NUM_CITIES );
- } while (target == last || targeted[target] == 1);
+ /* Start at the top, above the city in question: */
+ comets[location].x = cities[target].x;
+ comets[location].y = 0;
- last = target;
- targeted[target] = 1;
+ /* Pick a letter */
+ comets[location].ch = get_letter();
+ add--;
+ }
+ DEBUGCODE {if (location == MAX_COMETS)
+ printf("Location == MAX_COMETS, we have max on screen\n");}
+ }
+ }
+ else /* Odd number of cities (is this a hack that means we are using words?) */
+ {
+ LOG("NUM_CITIES is odd\n");
+ unsigned char *word = WORDS_get();
+ int i=0;
- /* Set in to attack that city: */
-
- comets[location].city = target;
+ DEBUGCODE {fprintf(stderr, "word is: %s\n", word);}
+ do
+ {
+ target = rand() % (NUM_CITIES - strlen(word) + 1);
+ } while (target == last);
+ last = target;
- /* Start at the top, above the city in question: */
-
- comets[location].x = cities[target].x;
- comets[location].y = 0;
-
- /* Pick a letter */
-
- comets[location].ch = get_letter();
- add--;
- }
- DEBUGCODE {
- if (location == MAX_COMETS)
- printf("Location == MAX_COMETS, we have max on screen\n");
- }
- } }
- else {
- unsigned char *word = WORDS_get();
- int i=0;
- do {
- target = int_rand( 0, NUM_CITIES-strlen(word)+1);
- } while (target == last);
- last = target;
-
- for (i=0; i<strlen(word); i++) {
+ for (i=0; i<strlen(word); i++)
+ {
while ((comets[location].alive == 1) && (location < MAX_COMETS))
location++;
- if (location < MAX_COMETS) {
-
+ if (location < MAX_COMETS)
+ {
comets[location].alive = 1;
comets[location].city = target+i;
comets[location].x = cities[target+i].x;
comets[location].y = 0;
comets[location].ch = word[i];
+ DEBUGCODE {fprintf(stderr, "Assigning letter to comet: %c\n", word[i]);}
}
}
}
+ LOG ("Leaving laser_add_comet()\n");
}
Modified: tuxtype/trunk/tuxtype/loaders.c
===================================================================
--- tuxtype/trunk/tuxtype/loaders.c 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/loaders.c 2006-11-17 11:14:10 UTC (rev 122)
@@ -177,6 +177,7 @@
/* try to find font first in theme dir, then in default */
for (i=useEnglish; i<2; i++) {
sprintf( fn, "%s/fonts/%s", realPath[i], fontfile );
+ DEBUGCODE { fprintf(stderr, "LoadFont(): looking for %s using data paths\n", fn ); }
if ( checkFile(fn) ) {
/* try to load the font, if successful, return font*/
@@ -193,6 +194,8 @@
/* "fallback" (the above _will_ fall): load the font with fixed-path */
sprintf( fn, "%s/%s", "/usr/share/fonts/truetype/ttf-gentium/", fontfile );
+ DEBUGCODE { fprintf(stderr, "LoadFont(): looking for %s\n in OS' font path\n", fn ); }
+
if ( checkFile(fn) ) {
/* try to load the font, if successful, return font*/
@@ -230,14 +233,17 @@
for (i = (useEnglish || (mode & IMG_NO_THEME)); i<2; i++) {
sprintf( fn, "%s/images/%s", realPath[i], datafile );
+ DEBUGCODE { fprintf(stderr, "LoadImage: looking in %s\n", fn); }
if ( checkFile( fn ) ) {
+ LOG ("file found\n");
tmp_pic = IMG_Load( fn );
if (tmp_pic != NULL)
break;
else
fprintf(stderr, "Warning: graphics file %s is corrupt\n", fn);
}
+ else LOG ("file NOT found\n");
}
if (tmp_pic == NULL) {
@@ -251,20 +257,30 @@
/* finally setup the image to the proper format */
switch (mode & IMG_MODES) {
- case IMG_REGULAR:
+
+ case IMG_REGULAR: {
final_pic = SDL_DisplayFormat(tmp_pic);
SDL_FreeSurface(tmp_pic);
break;
- case IMG_ALPHA:
+ }
+
+ case IMG_ALPHA: {
final_pic = SDL_DisplayFormatAlpha(tmp_pic);
SDL_FreeSurface(tmp_pic);
break;
- case IMG_COLORKEY:
+ }
+
+ case IMG_COLORKEY: {
SDL_LockSurface(tmp_pic);
SDL_SetColorKey(tmp_pic, (SDL_SRCCOLORKEY | SDL_RLEACCEL), SDL_MapRGB(tmp_pic->format, 255, 255, 0));
final_pic = SDL_DisplayFormat(tmp_pic);
SDL_FreeSurface(tmp_pic);
break;
+ }
+
+ default: {
+ LOG ("Image mode not recognized\n");
+ }
}
LOG( "LOADIMAGE: Done\n" );
Modified: tuxtype/trunk/tuxtype/main.c
===================================================================
--- tuxtype/trunk/tuxtype/main.c 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/main.c 2006-11-17 11:14:10 UTC (rev 122)
@@ -58,7 +58,7 @@
}
lib_flags = SDL_INIT_VIDEO;
-
+ /* FIXME this could go into something like HandleCommandArgs() */
// check command line args
if (argc > 1)
for (i = 1; i < argc; i++) {
@@ -133,8 +133,8 @@
lib_flags |= SDL_INIT_AUDIO;
- LibInit(lib_flags);
- GraphicsInit(video_flags);
+ 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);
Modified: tuxtype/trunk/tuxtype/playgame.c
===================================================================
--- tuxtype/trunk/tuxtype/playgame.c 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/playgame.c 2006-11-17 11:14:10 UTC (rev 122)
@@ -61,7 +61,9 @@
such that - min <= x <= max
***************************************/
int int_rand(int min, int max) {
- return min + (int) (((double)(max-min))*(float)rand()/(RAND_MAX+1.0)); // JA - FIX this doesn't return MAX
+ int diff = max - min;
+ return min + (rand() % diff); //NOTE I think this is what we want DSB
+// return min + (int) (((double)(max-min))*(float)rand()/(RAND_MAX+1.0)); // JA - FIX this doesn't return MAX
}
int check_word( int f ) {
@@ -581,7 +583,7 @@
fish_object[*fishies].word = WORDS_get();
fish_object[*fishies].len = strlen(fish_object[*fishies].word);
fish_object[*fishies].w = fishy->frame[0]->w * fish_object[*fishies].len;
- fish_object[*fishies].x = int_rand(0, screen->w - fish_object[*fishies].w);
+ fish_object[*fishies].x = rand() % (screen->w - fish_object[*fishies].w);
fish_object[*fishies].y = 0;
/* set the percentage of the speed based on length */
@@ -589,7 +591,7 @@
/* ex: a 9 letter word will be roughly twice as slow! 0.92^8 */
/* give it a random variance so the fish "crunch" isn't constant */
- fish_object[*fishies].dy *= (int_rand(75,100)/100.0);
+ fish_object[*fishies].dy *= ((75 + rand() % 25)/100.0);
switch (diflevel) {
case INF_PRACT:
fish_object[*fishies].dy = DEFAULT_SPEED;
Modified: tuxtype/trunk/tuxtype/playgame.h
===================================================================
--- tuxtype/trunk/tuxtype/playgame.h 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/playgame.h 2006-11-17 11:14:10 UTC (rev 122)
@@ -32,7 +32,7 @@
#define END_FRAME_DY 2 //rise speed of ending animation text
#define WIN_GAME_XAMP 4 //the xamplitide of winning game text circular motion
#define WIN_GAME_YAMP 4 //the yamplitude of winning game text circular motion
-#define WIN_GAME_ANGLE_MULT 4 //the angle multiplier for winning game te xt circ motion
+#define WIN_GAME_ANGLE_MULT 4 //the angle multiplier for winning game text circ motion
//tux frame lengths (number of frames each cell of animation frames on-screen)
#define WALK_ONSCREEN 10
Modified: tuxtype/trunk/tuxtype/practice.c
===================================================================
--- tuxtype/trunk/tuxtype/practice.c 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/practice.c 2006-11-17 11:14:10 UTC (rev 122)
@@ -27,6 +27,9 @@
Mix_Chunk *wrong;
+/*local function prototypes: */
+void print_at( char *pphrase, int wrap, int x, int y );
+
void practice_load_media(void) {
int i;
unsigned char fn[FNLEN];
Modified: tuxtype/trunk/tuxtype/setup.c
===================================================================
--- tuxtype/trunk/tuxtype/setup.c 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/setup.c 2006-11-17 11:14:10 UTC (rev 122)
@@ -42,6 +42,7 @@
fprintf(stderr, "-SDL Setting VidMode to %ix%ix%i\n", RES_X, RES_Y, BPP);
}
+ /* NOTE fullscreen vs. windowed is indicated by video_flags */
screen = SDL_SetVideoMode(RES_X, RES_Y, BPP, video_flags);
if (screen == NULL) {
@@ -139,8 +140,10 @@
#ifdef WIN32
snprintf( fn, FNLEN-1, "userdata/settings.txt" );
+ LOG("WIN32 defined\n");
#else
snprintf( fn, FNLEN-1, (const char*)"%s/.tuxtype/settings.txt", getenv("HOME") );
+ LOG("WIN32 not defined\n");
#endif
DEBUGCODE { printf("LoadSettings: settings file is '%s'\n", fn ); }
@@ -149,7 +152,7 @@
settingsFile = fopen( fn, "r" );
-
+ /* 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;
Modified: tuxtype/trunk/tuxtype/theme.c
===================================================================
--- tuxtype/trunk/tuxtype/theme.c 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/theme.c 2006-11-17 11:14:10 UTC (rev 122)
@@ -50,16 +50,32 @@
void setupTheme( char *dirName ) {
static struct stat dirStats;
int i;
-
+ int found = 0;
useEnglish=1; // default is to use English if we cannot find theme
- for (i=0; i<NUM_PATHS; i++) {
+ for (i=0; i<NUM_PATHS && !found; i++) {
+
+ DEBUGCODE{
+ fprintf(stderr, "setupTheme(): checking for: %s\n", PATHS[i]);
+ }
+
dirStats.st_mode = 0;
stat( PATHS[i], &dirStats );
if (S_IFDIR & dirStats.st_mode) {
strncpy( realPath[1], PATHS[i], FNLEN-1);
strncpy( themeName, "", FNLEN-1 );
+ found = 1; /* so quit looking */
+
+ DEBUGCODE{
+ fprintf(stderr, "path '%s' found, copy to realPath[1]\n", PATHS[i]);
+ }
}
+ else {
+ DEBUGCODE{
+ fprintf(stderr, "path '%s' not found.\n", PATHS[i]);
+ }
+ }
+
}
if (dirName != NULL) {
@@ -75,6 +91,14 @@
strncpy( themeName, dirName, FNLEN-1 );
}
}
+ DEBUGCODE
+ {
+ fprintf(stderr, "Leaving setupTheme():\n");
+ if (dirName != NULL)
+ fprintf(stderr, "realPath[0] = %s\n", realPath[0]);
+ fprintf(stderr, "realPath[1] = %s\n", realPath[1]);
+ }
+
}
void chooseTheme( void ) {
Modified: tuxtype/trunk/tuxtype/titlescreen.c
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.c 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/titlescreen.c 2006-11-17 11:14:10 UTC (rev 122)
@@ -22,13 +22,19 @@
#include "titlescreen.h"
/* --- media for menus --- */
+
+/* images of regular and selected text of menu items: */
SDL_Surface *reg_text[TITLE_MENU_ITEMS + 1][TITLE_MENU_DEPTH + 1];
SDL_Surface *sel_text[TITLE_MENU_ITEMS + 1][TITLE_MENU_DEPTH + 1];
sprite *reg;
sprite *sel;
+/* this will contain pointers to all of the menu 'icons' */
sprite *menu_gfx[TITLE_MENU_ITEMS + 1][TITLE_MENU_DEPTH + 1];
+/* keep track of the width of each menu: */
int menu_width[TITLE_MENU_DEPTH + 1];
+/* NOTE for 'depth', think pages like a restaurant menu, */
+/* not heirarchical depth - choice of term is misleading */
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
@@ -44,6 +50,7 @@
/* --- locations we need --- */
SDL_Rect text_dst[TITLE_MENU_ITEMS + 1]; // location of text for menu
SDL_Rect menu_gfxdest[TITLE_MENU_ITEMS + 1]; // location of animated icon
+/* These are the rectangular mouse event "buttons" for each menu item */
SDL_Rect menu_button[TITLE_MENU_ITEMS + 1]; // size of "button"
int chooseWordlist( void );
@@ -71,9 +78,11 @@
LOG("loading & parsing menu\n");
- for (j = 1; j <= TITLE_MENU_DEPTH; j++) {
+ for (j = 1; j <= TITLE_MENU_DEPTH; j++) /* Each 'depth' is a different menu */
+ {
max = 0;
- for (i = 1; i <= TITLE_MENU_ITEMS; i++) {
+ for (i = 1; i <= TITLE_MENU_ITEMS; i++)
+ {
/* --- create text surfaces --- */
@@ -88,40 +97,45 @@
sprintf(fn, "menu/%s", menu_icon[i][j]);
menu_gfx[i][j] = LoadSprite(fn, IMG_ALPHA);
}
- menu_width[j] = max + 20 + 40;
+ menu_width[j] = max + 20 + 40; // Not clear where '20' and '40' are coming from
}
LOG("done creating graphics, now setting positions\n");
+
/* --- setup menu item destinations --- */
+
menu_button[1].x = 240;
- menu_button[1].w = menu_width[1];
menu_button[1].y = 100;
- menu_button[1].h = sel->frame[1]->h;
+ menu_button[1].w = menu_width[1]; //calc from width of widest menu item
+ menu_button[1].h = sel->frame[1]->h; //height of sprite image
- menu_gfxdest[1].x = 246;
+ menu_gfxdest[1].x = menu_button[1].x + 6; // inset graphic by (6, 4) */
menu_gfxdest[1].y = menu_button[1].y + 4;
menu_gfxdest[1].w = 40;
menu_gfxdest[1].h = 50;
text_dst[1].y = menu_button[1].y+15;
- for (j=2; j<6; j++) {
+ /* FIXME each menu item drawn hardcoded 60 pixels below last - */
+ /* perhaps increment should be "menu_button[j-1].h + MENU_ITEM_GAP" */
+ for (j=2; j<6; j++)
+ {
/* --- setup vertical location of button text --- */
text_dst[j].y = text_dst[j-1].y + 60;
+ /* --- setup location of button background --- */
+ menu_button[j].x = menu_button[j-1].x;
+ menu_button[j].y = menu_button[j-1].y + 60;
+ menu_button[j].w = menu_button[j-1].w;
+ menu_button[j].h = menu_button[j-1].h;
+
/* --- setup location of animated icon --- */
menu_gfxdest[j].x = menu_gfxdest[j-1].x;
- menu_gfxdest[j].y = menu_gfxdest[j-1].y+60;
+ menu_gfxdest[j].y = menu_gfxdest[j-1].y + 60;
menu_gfxdest[j].w = menu_gfxdest[j-1].w;
menu_gfxdest[j].h = menu_gfxdest[j-1].h;
-
- /* --- setup location of button bkg --- */
- menu_button[j].x = 240;
- menu_button[j].y = menu_button[j-1].y + 60;
- menu_button[j].w = menu_width[1];
- menu_button[j].h = sel->frame[1]->h;
}
}
@@ -139,6 +153,12 @@
void TitleScreen_load_media( void ) {
/* --- 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");
@@ -158,6 +178,7 @@
Tux = LoadSprite("tux", IMG_ALPHA);
font = LoadFont( menu_font, menu_font_size );
+ /* Should probably call this directly from TitleScreen() */
TitleScreen_load_menu();
}
@@ -186,13 +207,13 @@
TitleScreen_unload_menu();
}
-void NotImplimented(void) {
+void NotImplemented(void) {
SDL_Surface *s1, *s2, *s3, *s4;
sprite *tux;
SDL_Rect loc;
int finished=0,i;
- LOG( "NotImplimented() - creating text\n" );
+ LOG( "NotImplemented() - creating text\n" );
s1 = black_outline( _("Work In Progress!"), font, &white);
s2 = black_outline( _("This feature is not ready yet"), font, &white);
@@ -209,7 +230,7 @@
} else
s4 = black_outline( "http://tuxtype.sf.net/forums", font, &white);
- LOG( "NotImplimented() - drawing screen\n" );
+ LOG( "NotImplemented() - drawing screen\n" );
SDL_BlitSurface( bkg, NULL, screen, NULL );
loc.x = 320-(s1->w/2); loc.y = 10;
@@ -265,7 +286,8 @@
*****************************************
* display title screen, get input
*/
-void TitleScreen( void ) {
+void TitleScreen( void )
+{
SDL_Rect dest,
Tuxdest,
@@ -290,12 +312,14 @@
menu_music=localsettings.menu_music;
}
- /*
- * StandbyScreen: Display the Standby screen....
- */
+ /* FIXME phrase(s) should come from file */
strncpy( phrase, "Now is the time for all good men to come to the aid of their country.", 128);
start = SDL_GetTicks();
+ /*
+ * StandbyScreen: Display the Standby screen....
+ */
+
if (show_tux4kids) {
SDL_Surface *standby;
@@ -312,6 +336,7 @@
SDL_FreeSurface(standby);
}
+ /* Load media and menu data: */
TitleScreen_load_media();
SDL_WM_GrabInput(SDL_GRAB_ON);
@@ -319,7 +344,7 @@
* Tux and Title animations *
***************************/
- LOG( "->Now Animatiting Tux and Title on to the screen\n" );
+ LOG( "->Now Animating Tux and Title onto the screen\n" );
Tuxdest.x = 0;
Tuxdest.y = screen->h;
@@ -345,11 +370,13 @@
}
SDL_ShowCursor(1);
+ /* FIXME not sure the next line works in Windows: */
TransWipe(bkg, RANDOM_WIPE, 10, 20);
/* --- Pull tux & logo onscreen --- */
- for (i = 0; i < (PRE_ANIM_FRAMES * PRE_FRAME_MULT); i++) {
+ for (i = 0; i < (PRE_ANIM_FRAMES * PRE_FRAME_MULT); i++)
+ {
start = SDL_GetTicks();
SDL_BlitSurface(bkg, &Tuxdest, screen, &Tuxdest);
SDL_BlitSurface(bkg, &Titledest, screen, &Titledest);
@@ -367,151 +394,233 @@
SDL_Delay(2);
}
- SDL_BlitSurface(title, NULL, screen, &Titledest);
+ SDL_BlitSurface(title, NULL, screen, &Titledest);
+
+ /* Pick speaker graphic according to whether music is on: */
if ( menu_music )
SDL_BlitSurface(speaker, NULL, screen, &spkrdest);
else
SDL_BlitSurface(speakeroff, NULL, screen, &spkrdest);
+ /* Start playing menu music if desired: */
+ if (menu_music)
+ audioMusicLoad( "tuxi.ogg", -1 );
+
LOG( "Tux and Title are in place now\n" );
+ /* Move mouse to top button: */
cursor.x = menu_button[1].x + (menu_button[1].w / 2);
cursor.y = menu_button[1].y + (3 * menu_button[1].h / 4);
-
SDL_WarpMouse(cursor.x, cursor.y);
SDL_WM_GrabInput(SDL_GRAB_OFF);
- if (menu_music)
- audioMusicLoad( "tuxi.ogg", -1 );
+
/****************************
* Main Loop Starts Here ... *
****************************/
+
menu_depth = 1;
int firstloop=1;
Tuxdest.y = screen->h - Tux->frame[0]->h;
- while (!done) {
+ while (!done)
+ {
- start=SDL_GetTicks();
+ start=SDL_GetTicks();
- /* ---process input queue --- */
+ /* ---process input queue --- */
- menu_opt = NONE; // clear the option so we don't change twice!
+ menu_opt = NONE; // clear the option so we don't change twice!
- old_key_menu = key_menu;
+ old_key_menu = key_menu;
- while (SDL_PollEvent(&event)) {
- switch (event.type) {
- case SDL_MOUSEMOTION:
- cursor.x = event.motion.x;
- cursor.y = event.motion.y;
- break;
-
- case SDL_MOUSEBUTTONDOWN:
- cursor.x = event.motion.x;
- cursor.y = event.motion.y;
- for (j = 1; j <= TITLE_MENU_ITEMS; j++)
- if ((cursor.x >= menu_button[j].x && cursor.x <= (menu_button[j].x + menu_button[j].w)) &&
- (cursor.y >= menu_button[j].y && cursor.y <= (menu_button[j].y + menu_button[j].h))) {
- menu_opt = menu_item[j][menu_depth];
- if (menu_sound)
- playsound(snd_select);
- DEBUGCODE {
- fprintf(stderr, "->>BUTTON CLICK menu_opt = %d\n", menu_opt);
- fprintf(stderr, "->J = %d menu_depth=%d\n", j, menu_depth);
- }
- }
- if ((cursor.x >= spkrdest.x && cursor.x <= (spkrdest.x + spkrdest.w)) &&
- (cursor.y >= spkrdest.y && cursor.y <= (spkrdest.y + spkrdest.h))) {
- if (menu_music==1) {
- audioMusicUnload( );
- menu_music=0;
- } else {
- if (menu_music==0){
- menu_music=1;
- audioMusicLoad( "tuxi.ogg", -1 );
- }
- }
- redraw=1;
- }
- break;
-
- case SDL_QUIT:
- menu_opt = QUIT_GAME;
- break;
-
- case SDL_KEYDOWN:
- switch (event.key.keysym.sym) {
- case SDLK_ESCAPE:
- if (menu_sound)
- playsound(snd_select);
- if (menu_depth != 1)
- menu_opt = MAIN;
- else
- menu_opt = QUIT_GAME;
- break;
- case SDLK_F10:
- switch_screen_mode();
- redraw=1;
- break;
- case SDLK_F11:
- if (menu_music==1) {
- audioMusicUnload( );
- menu_music=0;
- } else {
- if (menu_music==0){
- menu_music=1;
- audioMusicLoad( "tuxi.ogg", -1 );
- }
- }
- redraw=1;
- break;
- case SDLK_F12:
- /* --- reload translation/graphics/media: for themers/translaters --- */
- TitleScreen_unload_media();
- LoadLang();
- TitleScreen_load_media();
- redraw = 1;
- break;
- case SDLK_UP:
- if (menu_sound)
- playsound(snd_move);
- key_menu--;
- if (key_menu < 1)
- key_menu = 5;
- break;
- case SDLK_DOWN:
- key_menu++;
- if (menu_sound)
- playsound(snd_move);
- if (key_menu > 5)
- key_menu = 1;
- break;
- case SDLK_RETURN:
- if (key_menu) {
- menu_opt = menu_item[key_menu][menu_depth];
- if (menu_sound)
- playsound(snd_select);
- break;
- }
- default:
- break;
- }
- break;
- }
- }
+ /* Retrieve any user interface events: */
+ while (SDL_PollEvent(&event))
+ {
+ switch (event.type)
+ {
- /* --- warp mouse to follow keyboard input --- */
+ case SDL_MOUSEMOTION:
+ {
+ cursor.x = event.motion.x;
+ cursor.y = event.motion.y;
+ break;
+ }
- if (old_key_menu != key_menu) {
- cursor.x = menu_button[key_menu].x + (menu_button[key_menu].w / 2);
- cursor.y = menu_button[key_menu].y + (3 * menu_button[key_menu].h / 4);
- SDL_WarpMouse(cursor.x, cursor.y);
- }
+ /* Handle mouse clicks based on mouse location: */
+ case SDL_MOUSEBUTTONDOWN:
+ {
+ cursor.x = event.motion.x;
+ cursor.y = event.motion.y;
+
+ for (j = 1; j <= TITLE_MENU_ITEMS; j++)
+ {
+ if ((cursor.x >= menu_button[j].x && cursor.x <= (menu_button[j].x + menu_button[j].w)) &&
+ (cursor.y >= menu_button[j].y && cursor.y <= (menu_button[j].y + menu_button[j].h)))
+ {
+ menu_opt = menu_item[j][menu_depth];
+ if (menu_sound)
+ {
+ playsound(snd_select);
+ }
+ DEBUGCODE
+ {
+ fprintf(stderr, "->>BUTTON CLICK menu_opt = %d\n", menu_opt);
+ fprintf(stderr, "->J = %d menu_depth=%d\n", j, menu_depth);
+ }
+ }
+ }
+
+ /* If mouse over speaker, toggle menu music off or on: */
+ if ((cursor.x >= spkrdest.x && cursor.x <= (spkrdest.x + spkrdest.w)) &&
+ (cursor.y >= spkrdest.y && cursor.y <= (spkrdest.y + spkrdest.h)))
+ {
+ if (menu_music)
+ {
+ audioMusicUnload();
+ menu_music = 0;
+ }
+ else
+ {
+ menu_music = 1;
+ audioMusicLoad("tuxi.ogg", -1);
+ }
+ redraw = 1;
+ }
+ break;
+ }
+
+
+
+ case SDL_QUIT:
+ {
+ menu_opt = QUIT_GAME;
+ break;
+ }
+
+
+ /* Handle key press events based on key value: */
+ case SDL_KEYDOWN:
+ {
+ switch (event.key.keysym.sym)
+ {
+
+ case SDLK_ESCAPE:
+ {
+ /* Go to main menu (if in submenu) or quit: */
+ if (menu_depth != 1)
+ menu_opt = MAIN;
+ else
+ menu_opt = QUIT_GAME;
+
+ if (menu_sound)
+ playsound(snd_select);
+ break;
+ }
+
+ /* Toggle screen mode: */
+ case SDLK_F10: /* NOTE Cool! - should add this to TuxMath*/
+ {
+ switch_screen_mode();
+ redraw = 1;
+ break;
+ }
+
+ /* Toggle menu music: */
+ case SDLK_F11:
+ {
+ if (menu_music)
+ {
+ audioMusicUnload( );
+ menu_music=0;
+ }
+ else
+ {
+ menu_music=1;
+ audioMusicLoad("tuxi.ogg", -1);
+ }
+ redraw = 1;
+ break;
+ }
+
+
+ /* --- reload translation/graphics/media: for themers/translaters --- */
+ case SDLK_F12:
+ {
+ TitleScreen_unload_media();
+ LoadLang();
+ TitleScreen_load_media();
+ redraw = 1;
+ break;
+ }
+
+
+ case SDLK_UP:
+ {
+ if (menu_sound)
+ playsound(snd_move);
+ key_menu--;
+ if (key_menu < 1)
+ key_menu = 5;
+ break;
+ }
+
+
+ case SDLK_DOWN:
+ {
+ key_menu++;
+ if (menu_sound)
+ playsound(snd_move);
+ if (key_menu > 5)
+ key_menu = 1;
+ break;
+ }
+
+
+ case SDLK_RETURN:
+ {
+ if (key_menu)
+ {
+ menu_opt = menu_item[key_menu][menu_depth];
+ if (menu_sound)
+ playsound(snd_select);
+ }
+ break;
+ }
+
+
+ default: /* Some other key pressed - do nothing: */
+ {
+ break;
+ }
+ } /* End of switch(event.key.keysym.sym) statement */
+ } /* End of case: SDL_KEYDOWN: */
+
+
+ default: /* Some other type of SDL event - do nothing; */
+ {
+ break;
+ }
+ } /* End of switch(event.type) statement */
+ } /* End of while (SDL_PollEvent(&event)) loop */
+
+
+
+ /* --- warp mouse to follow keyboard input --- */
+
+ if (old_key_menu != key_menu)
+ {
+ cursor.x = menu_button[key_menu].x + (menu_button[key_menu].w / 2);
+ cursor.y = menu_button[key_menu].y + (3 * menu_button[key_menu].h / 4);
+ SDL_WarpMouse(cursor.x, cursor.y);
+ }
+
+
+
/* --- do menu processing --- */
if (menu_opt == QUIT_GAME)
@@ -545,7 +654,7 @@
}
if (menu_opt == NOT_CODED) {
- NotImplimented();
+ NotImplemented();
redraw=1;
}
@@ -656,6 +765,10 @@
redraw = 1;
}
+
+
+
+
if (redraw) {
SDL_BlitSurface(bkg, NULL, screen, NULL);
SDL_BlitSurface(title, NULL, screen, &Titledest);
@@ -669,6 +782,8 @@
firstloop=1;
}
+
+
/* --- create new menu screen when needed --- */
if (update_locs) {
@@ -691,6 +806,8 @@
}
}
+
+
/* --- make tux blink --- */
tux_frame = 0;
@@ -800,6 +917,8 @@
struct stat fileStats;
FILE *tempFile;
+ LOG("Entering chooseWordlist():\n");
+
/* find the directory to load wordlists from */
for (i=useEnglish; i<2; i++) {
@@ -815,6 +934,8 @@
exit(1);
}
+ DEBUGCODE { fprintf(stderr, "wordPath is: %s\n", wordPath); }
+
/* create a list of all the .txt files */
wordsDir = opendir( wordPath );
@@ -992,6 +1113,9 @@
return 1;
}
+
+
+
void switch_screen_mode(void)
{
SDL_Surface *tmp;
Modified: tuxtype/trunk/tuxtype/titlescreen.h
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.h 2006-07-19 11:43:59 UTC (rev 121)
+++ tuxtype/trunk/tuxtype/titlescreen.h 2006-11-17 11:14:10 UTC (rev 122)
@@ -10,6 +10,7 @@
#define ROOTMENU 1
/* --- define menu structure --- */
+/* (these values are all in the Game_Type enum in globals.h) */
const int menu_item[][6]= {{0, 0, 0, 0, 0},
{0, CASCADE, LEVEL1, LEVEL1, NOT_CODED },
{0, LASER, LEVEL2, LEVEL2, FREETYPE },
More information about the Tux4kids-commits
mailing list