[Tux4kids-commits] r882 - in tuxmath/trunk: data/images/factoroids data/images/sprites nsis src
fongog-guest at alioth.debian.org
fongog-guest at alioth.debian.org
Fri Feb 13 06:07:25 UTC 2009
Author: fongog-guest
Date: 2009-02-13 06:07:24 +0000 (Fri, 13 Feb 2009)
New Revision: 882
Modified:
tuxmath/trunk/data/images/factoroids/Makefile
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/nsis/tuxmath.nsi
tuxmath/trunk/nsis/tuxmath_with_conf.nsi
tuxmath/trunk/src/factoroids.c
Log:
The factoroids adjust the size of the ship and the asteroids to the screen resolution.
Modified: tuxmath/trunk/data/images/factoroids/Makefile
===================================================================
--- tuxmath/trunk/data/images/factoroids/Makefile 2009-02-12 23:09:37 UTC (rev 881)
+++ tuxmath/trunk/data/images/factoroids/Makefile 2009-02-13 06:07:24 UTC (rev 882)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# data/images/factroids/Makefile. Generated from Makefile.in by configure.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# data/images/factoroids/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
-srcdir = .
-top_srcdir = ../../..
pkgdatadir = $(datadir)/tuxmath
pkglibdir = $(libdir)/tuxmath
pkgincludedir = $(includedir)/tuxmath
-top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -37,7 +33,7 @@
build_triplet = i686-pc-linux-gnu
host_triplet = i686-pc-linux-gnu
target_triplet = i686-pc-linux-gnu
-subdir = data/images/factroids
+subdir = data/images/factoroids
DIST_COMMON = $(dist_comets_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -45,19 +41,19 @@
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intmax.m4 \
- $(top_srcdir)/m4/inttypes-pri.m4 \
+ $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+ $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
- $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -75,18 +71,14 @@
dist_cometsDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_comets_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run aclocal-1.10
ALLOCA =
-AMDEP_FALSE = #
-AMDEP_TRUE =
-AMTAR = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run automake-1.9
+AMTAR = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run automake-1.10
AWK = mawk
BUILD_INCLUDED_LIBINTL = no
-BUILD_MINGW32_FALSE =
-BUILD_MINGW32_TRUE = #
CATOBJEXT = .gmo
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -104,6 +96,7 @@
EGREP = /bin/grep -E
EXEEXT =
GENCAT = gencat
+GETTEXT_MACRO_VERSION = 0.17
GLIBC2 = yes
GLIBC21 = yes
GMSGFMT = /usr/bin/msgfmt
@@ -114,10 +107,11 @@
HAVE_SNPRINTF = 1
HAVE_VISIBILITY = 1
HAVE_WPRINTF = 0
+INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
INSTOBJEXT = .mo
INTLBISON = :
INTLLIBS =
@@ -130,32 +124,32 @@
LIBMULTITHREAD = -lpthread
LIBOBJS =
LIBPTH =
-LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_gfx
+LIBPTH_PREFIX =
+LIBS = -lSDL_ttf -lSDL_mixer -lSDL_image -L/usr/lib -lSDL
LIBTHREAD =
+LTLIBC = -lc
LTLIBICONV =
LTLIBINTL =
LTLIBMULTITHREAD = -lpthread
LTLIBOBJS =
LTLIBPTH =
LTLIBTHREAD =
-MAKEINFO = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
MSGMERGE = /usr/bin/msgmerge
-NAME_VERSION = tuxmath-1.7.0
+NAME_VERSION = tuxmath-1.7.1
NSIS =
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE =
-NSI_DLL_DIR = /home/usuario/tuxmath_dll
+NSI_DLL_DIR = /home/gog/tuxmath_dll
NSI_INSTALL_DIR = mingw32
OBJEXT = o
PACKAGE = tuxmath
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
-PACKAGE_DATA_DIR = data
PACKAGE_NAME = Tux Of Math Command
-PACKAGE_STRING = Tux Of Math Command 1.7.0
+PACKAGE_STRING = Tux Of Math Command 1.7.1
PACKAGE_TARNAME = tuxmath
-PACKAGE_VERSION = 1.7.0
+PACKAGE_VERSION = 1.7.1
PATH_SEPARATOR = :
POSUB = po
POW_LIB =
@@ -169,16 +163,20 @@
STRIP =
USE_INCLUDED_LIBINTL = no
USE_NLS = yes
-VERSION = 1.7.0
+VERSION = 1.7.1
WINDRES =
+WOE32 = no
WOE32DLL = no
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
+XGETTEXT_EXTRA_OPTIONS =
YACC = yacc
YFLAGS =
+abs_builddir = /home/gog/svn2/tuxmath/trunk/data/images/factoroids
+abs_srcdir = /home/gog/svn2/tuxmath/trunk/data/images/factoroids
+abs_top_builddir = /home/gog/svn2/tuxmath/trunk
+abs_top_srcdir = /home/gog/svn2/tuxmath/trunk
ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE =
am__include = include
am__leading_dot = .
am__quote =
@@ -190,6 +188,7 @@
build_cpu = i686
build_os = linux-gnu
build_vendor = pc
+builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
@@ -203,13 +202,13 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = /home/usuario/code/tuxmath/trunk/install-sh
+install_sh = $(SHELL) /home/gog/svn2/tuxmath/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
prefix = /usr/local
@@ -217,13 +216,16 @@
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
+srcdir = .
sysconfdir = ${prefix}/etc
target = i686-pc-linux-gnu
target_alias =
target_cpu = i686
target_os = linux-gnu
target_vendor = pc
-cometsdir = $(pkgdatadir)/images/factroids
+top_builddir = ../../..
+top_srcdir = ../../..
+cometsdir = $(pkgdatadir)/images/factoroids
dist_comets_DATA = asteroid1.png \
galaxy2.png \
star1.jpg \
@@ -241,7 +243,7 @@
factoroids.png \
factors.png \
tux.png \
- good.png
+ good.png
all: all-am
@@ -255,9 +257,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/images/factroids/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/images/factoroids/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/images/factroids/Makefile
+ $(AUTOMAKE) --foreign data/images/factoroids/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -275,10 +277,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_cometsDATA: $(dist_comets_DATA)
@$(NORMAL_INSTALL)
- test -z "$(cometsdir)" || $(mkdir_p) "$(DESTDIR)$(cometsdir)"
+ test -z "$(cometsdir)" || $(MKDIR_P) "$(DESTDIR)$(cometsdir)"
@list='$(dist_comets_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -301,22 +302,21 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -332,7 +332,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(cometsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -378,12 +378,20 @@
install-data-am: install-dist_cometsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -402,17 +410,21 @@
ps-am:
-uninstall-am: uninstall-dist_cometsDATA uninstall-info-am
+uninstall-am: uninstall-dist_cometsDATA
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_cometsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_cometsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_cometsDATA uninstall-info-am
+ uninstall-dist_cometsDATA
# 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.
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2009-02-12 23:09:37 UTC (rev 881)
+++ tuxmath/trunk/data/images/sprites/Makefile 2009-02-13 06:07:24 UTC (rev 882)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# data/images/sprites/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
-srcdir = .
-top_srcdir = ../../..
pkgdatadir = $(datadir)/tuxmath
pkglibdir = $(libdir)/tuxmath
pkgincludedir = $(includedir)/tuxmath
-top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -45,19 +41,19 @@
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intmax.m4 \
- $(top_srcdir)/m4/inttypes-pri.m4 \
+ $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+ $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
- $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
- $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/visibility.m4 \
+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -75,18 +71,14 @@
dist_spritesDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_sprites_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run aclocal-1.10
ALLOCA =
-AMDEP_FALSE = #
-AMDEP_TRUE =
-AMTAR = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run automake-1.9
+AMTAR = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run automake-1.10
AWK = mawk
BUILD_INCLUDED_LIBINTL = no
-BUILD_MINGW32_FALSE =
-BUILD_MINGW32_TRUE = #
CATOBJEXT = .gmo
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -104,6 +96,7 @@
EGREP = /bin/grep -E
EXEEXT =
GENCAT = gencat
+GETTEXT_MACRO_VERSION = 0.17
GLIBC2 = yes
GLIBC21 = yes
GMSGFMT = /usr/bin/msgfmt
@@ -114,10 +107,11 @@
HAVE_SNPRINTF = 1
HAVE_VISIBILITY = 1
HAVE_WPRINTF = 0
+INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
INSTOBJEXT = .mo
INTLBISON = :
INTLLIBS =
@@ -130,32 +124,32 @@
LIBMULTITHREAD = -lpthread
LIBOBJS =
LIBPTH =
-LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_gfx
+LIBPTH_PREFIX =
+LIBS = -lSDL_ttf -lSDL_mixer -lSDL_image -L/usr/lib -lSDL
LIBTHREAD =
+LTLIBC = -lc
LTLIBICONV =
LTLIBINTL =
LTLIBMULTITHREAD = -lpthread
LTLIBOBJS =
LTLIBPTH =
LTLIBTHREAD =
-MAKEINFO = ${SHELL} /home/usuario/code/tuxmath/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/gog/svn2/tuxmath/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
MSGMERGE = /usr/bin/msgmerge
-NAME_VERSION = tuxmath-1.7.0
+NAME_VERSION = tuxmath-1.7.1
NSIS =
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE =
-NSI_DLL_DIR = /home/usuario/tuxmath_dll
+NSI_DLL_DIR = /home/gog/tuxmath_dll
NSI_INSTALL_DIR = mingw32
OBJEXT = o
PACKAGE = tuxmath
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
-PACKAGE_DATA_DIR = data
PACKAGE_NAME = Tux Of Math Command
-PACKAGE_STRING = Tux Of Math Command 1.7.0
+PACKAGE_STRING = Tux Of Math Command 1.7.1
PACKAGE_TARNAME = tuxmath
-PACKAGE_VERSION = 1.7.0
+PACKAGE_VERSION = 1.7.1
PATH_SEPARATOR = :
POSUB = po
POW_LIB =
@@ -169,16 +163,20 @@
STRIP =
USE_INCLUDED_LIBINTL = no
USE_NLS = yes
-VERSION = 1.7.0
+VERSION = 1.7.1
WINDRES =
+WOE32 = no
WOE32DLL = no
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
+XGETTEXT_EXTRA_OPTIONS =
YACC = yacc
YFLAGS =
+abs_builddir = /home/gog/svn2/tuxmath/trunk/data/images/sprites
+abs_srcdir = /home/gog/svn2/tuxmath/trunk/data/images/sprites
+abs_top_builddir = /home/gog/svn2/tuxmath/trunk
+abs_top_srcdir = /home/gog/svn2/tuxmath/trunk
ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE =
am__include = include
am__leading_dot = .
am__quote =
@@ -190,6 +188,7 @@
build_cpu = i686
build_os = linux-gnu
build_vendor = pc
+builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
@@ -203,13 +202,13 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = /home/usuario/code/tuxmath/trunk/install-sh
+install_sh = $(SHELL) /home/gog/svn2/tuxmath/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
prefix = /usr/local
@@ -217,14 +216,20 @@
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
+srcdir = .
sysconfdir = ${prefix}/etc
target = i686-pc-linux-gnu
target_alias =
target_cpu = i686
target_os = linux-gnu
target_vendor = pc
+top_builddir = ../../..
+top_srcdir = ../../..
spritesdir = $(pkgdatadir)/images/sprites
-dist_sprites_DATA = comet0.png \
+dist_sprites_DATA = alone0.png \
+ alone1.png \
+ aloned.png \
+ comet0.png \
comet1.png \
comet2.png \
comet3.png \
@@ -236,6 +241,27 @@
credits2.png \
credits3.png \
creditsd.png \
+ factoroids0.png \
+ factoroids1.png \
+ factoroids2.png \
+ factoroidsd.png \
+ factors0.png \
+ factors1.png \
+ factors2.png \
+ factors3.png \
+ factors4.png \
+ factors5.png \
+ factorsd.png \
+ fleet0.png \
+ fleetd.png \
+ fractions0.png \
+ fractions1.png \
+ fractions2.png \
+ fractions3.png \
+ fractions4.png \
+ fractions5.png \
+ fractions6.png \
+ fractionsd.png \
goldstard.png \
goldstar0.png \
goldstar1.png \
@@ -261,6 +287,8 @@
quit0.png \
no_goldstar0.png \
no_goldstard.png \
+ friends0.png \
+ friendsd.png \
quit1.png \
quit2.png \
quit3.png \
@@ -279,6 +307,8 @@
tux_config_brown1.png \
tux_config_brownd.png \
tux_configd.png \
+ tux_helmet_black0.png \
+ tux_helmet_blackd.png \
tux_helmet_blue0.png \
tux_helmet_blue1.png \
tux_helmet_blue2.png \
@@ -340,10 +370,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_spritesDATA: $(dist_sprites_DATA)
@$(NORMAL_INSTALL)
- test -z "$(spritesdir)" || $(mkdir_p) "$(DESTDIR)$(spritesdir)"
+ test -z "$(spritesdir)" || $(MKDIR_P) "$(DESTDIR)$(spritesdir)"
@list='$(dist_sprites_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -366,22 +395,21 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -397,7 +425,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(spritesdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -443,12 +471,20 @@
install-data-am: install-dist_spritesDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -467,17 +503,21 @@
ps-am:
-uninstall-am: uninstall-dist_spritesDATA uninstall-info-am
+uninstall-am: uninstall-dist_spritesDATA
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_spritesDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_spritesDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_spritesDATA uninstall-info-am
+ uninstall-dist_spritesDATA
# 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.
Modified: tuxmath/trunk/nsis/tuxmath.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi 2009-02-12 23:09:37 UTC (rev 881)
+++ tuxmath/trunk/nsis/tuxmath.nsi 2009-02-13 06:07:24 UTC (rev 882)
@@ -3,7 +3,7 @@
# modified for tuxmath by Yves Combe (yves at ycombe.net)
# modified more for tuxmath by David Bruce <dbruce at tampabay.rr.com>
-!define PKG_VERSION "1.7.0"
+!define PKG_VERSION "1.7.1"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
@@ -31,7 +31,7 @@
InstallDirRegKey HKLM SOFTWARE\${APP_PREFIX} "Install_Dir"
# Licence text
-LicenseText "You must agree to this license before installing ${APP_NAME}"
+LicenseText "Please read the terms of the General Public License before installing ${APP_NAME}"
LicenseData "mingw32\doc\COPYING.txt"
# Directory browsing
Modified: tuxmath/trunk/nsis/tuxmath_with_conf.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2009-02-12 23:09:37 UTC (rev 881)
+++ tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2009-02-13 06:07:24 UTC (rev 882)
@@ -2,7 +2,7 @@
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
-!define PKG_VERSION "1.7.0"
+!define PKG_VERSION "1.7.1"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
Modified: tuxmath/trunk/src/factoroids.c
===================================================================
--- tuxmath/trunk/src/factoroids.c 2009-02-12 23:09:37 UTC (rev 881)
+++ tuxmath/trunk/src/factoroids.c 2009-02-13 06:07:24 UTC (rev 882)
@@ -42,6 +42,7 @@
#define FPS 15 /* 15 frames per second */
#define MS_PER_FRAME (1000 / FPS)
+#define BASE_RES_X 1280
#define MAX_LASER 5
#define MAX_ASTEROIDS 50
@@ -393,18 +394,21 @@
{
int i;
float zoom;
+
SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
SDL_Flip(screen);
FF_intro();
if(screen->h < 600 && screen->w < 800)
- zoom = 0.7;
+ zoom = 0.65;
else
- zoom = 1;
+ zoom=(float)screen->w/(float)BASE_RES_X;
- /*********** Precalculating software rotation *********/
+ printf("The zoome rate is: %f\n", zoom);
+ /*************** Precalculating software rotation ***************/
+
for(i = 0; i < NUM_OF_ROTO_IMGS; i++)
{
//rotozoomSurface (SDL_Surface *src, double angle, double zoom, int smooth);
@@ -537,9 +541,9 @@
float zoom;
if(screen->h < 600 && screen->w < 800)
- zoom = 0.7;
+ zoom = 0.65;
else
- zoom = 1;
+ zoom=(float)screen->w/(float)BASE_RES_X;
IMG_factors = rotozoomSurface(images[IMG_FACTOROIDS], 0, zoom, 1);
IMG_fractions = rotozoomSurface(images[IMG_FACTORS], 0, zoom, 1);
More information about the Tux4kids-commits
mailing list