[Tux4kids-commits] r1390 - in branches/commonification/tuxmath/trunk: data/images/menu data/images/tux src
Bolesław Kulbabiński
bolekk-guest at alioth.debian.org
Fri Aug 7 19:33:38 UTC 2009
Author: bolekk-guest
Date: 2009-08-07 19:33:38 +0000 (Fri, 07 Aug 2009)
New Revision: 1390
Removed:
branches/commonification/tuxmath/trunk/data/images/menu/Makefile
branches/commonification/tuxmath/trunk/data/images/menu/Makefile.in
Modified:
branches/commonification/tuxmath/trunk/data/images/tux/console_bash.png
branches/commonification/tuxmath/trunk/data/images/tux/console_led.png
branches/commonification/tuxmath/trunk/src/fileops.h
branches/commonification/tuxmath/trunk/src/fileops_media.c
branches/commonification/tuxmath/trunk/src/game.c
branches/commonification/tuxmath/trunk/src/game.h
branches/commonification/tuxmath/trunk/src/loaders.c
branches/commonification/tuxmath/trunk/src/setup.c
Log:
work on making game images resizable
Deleted: branches/commonification/tuxmath/trunk/data/images/menu/Makefile
===================================================================
--- branches/commonification/tuxmath/trunk/data/images/menu/Makefile 2009-08-07 19:04:09 UTC (rev 1389)
+++ branches/commonification/tuxmath/trunk/data/images/menu/Makefile 2009-08-07 19:33:38 UTC (rev 1390)
@@ -1,573 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# data/images/menu/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-
-pkgdatadir = $(datadir)/tuxmath
-pkglibdir = $(libdir)/tuxmath
-pkgincludedir = $(includedir)/tuxmath
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
-subdir = data/images/menu
-DIST_COMMON = $(dist_menu_DATA) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(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/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/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
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(menudir)"
-dist_menuDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_menu_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/bolek/tmp/commonification/tuxmath/trunk/missing --run aclocal-1.10
-ALLOCA =
-AMTAR = ${SHELL} /home/bolek/tmp/commonification/tuxmath/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/bolek/tmp/commonification/tuxmath/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/bolek/tmp/commonification/tuxmath/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/bolek/tmp/commonification/tuxmath/trunk/missing --run automake-1.10
-AWK = gawk
-BUILD_INCLUDED_LIBINTL = no
-CAIRO_CFLAGS = -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-CAIRO_LIBS = -lcairo
-CATOBJEXT = .gmo
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-CFLAG_VISIBILITY = -fvisibility=hidden
-CPP = gcc -E
-CPPFLAGS =
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CYGPATH_W = echo
-DATADIRNAME = share
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = /bin/grep -E
-EXEEXT =
-GENCAT = gencat
-GETTEXT_MACRO_VERSION = 0.17
-GLIBC2 = yes
-GLIBC21 = yes
-GMSGFMT = /usr/bin/gmsgfmt
-GMSGFMT_015 = /usr/bin/gmsgfmt
-GREP = /bin/grep
-HAVE_ASPRINTF = 1
-HAVE_POSIX_PRINTF = 1
-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 = $(install_sh) -c -s
-INSTOBJEXT = .mo
-INTLBISON = bison
-INTLLIBS =
-INTLOBJS =
-INTL_LIBTOOL_SUFFIX_PREFIX =
-INTL_MACOSX_LIBS =
-LDFLAGS =
-LIBICONV =
-LIBINTL =
-LIBMULTITHREAD = -lpthread
-LIBOBJS =
-LIBPTH =
-LIBPTH_PREFIX =
-LIBS = -lt4kcommon -lSDL_Pango -lSDL_mixer -lSDL_image -lSDL -lpthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lcairo
-LIBTHREAD =
-LTLIBC = -lc
-LTLIBICONV =
-LTLIBINTL =
-LTLIBMULTITHREAD = -lpthread
-LTLIBOBJS =
-LTLIBPTH =
-LTLIBTHREAD =
-MAKEINFO = ${SHELL} /home/bolek/tmp/commonification/tuxmath/trunk/missing --run makeinfo
-MINGW32_PACKAGE_DATA_DIR = data
-MKDIR_P = /bin/mkdir -p
-MSGFMT = /usr/bin/msgfmt
-MSGFMT_015 = /usr/bin/msgfmt
-MSGMERGE = /usr/bin/msgmerge
-NAME_VERSION = tuxmath-1.7.3
-NSIS =
-NSI_DLL_DIR = /home/bolek/tuxmath_dll
-NSI_INSTALL_DIR = mingw32
-OBJEXT = o
-PACKAGE = tuxmath
-PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
-PACKAGE_NAME = Tux Of Math Command
-PACKAGE_STRING = Tux Of Math Command 1.7.3
-PACKAGE_TARNAME = tuxmath
-PACKAGE_VERSION = 1.7.3
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-POSUB = po
-POW_LIB =
-PRI_MACROS_BROKEN = 0
-RANLIB = ranlib
-RSVG_CFLAGS = -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-RSVG_LIBS = -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
-SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-SDL_CONFIG = /usr/bin/sdl-config
-SDL_LIBS = -lSDL -lpthread
-SET_MAKE =
-SHELL = /bin/sh
-STRIP =
-USE_INCLUDED_LIBINTL = no
-USE_NLS = yes
-VERSION = 1.7.3
-WINDRES =
-WOE32 = no
-WOE32DLL = no
-XGETTEXT = /usr/bin/xgettext
-XGETTEXT_015 = /usr/bin/xgettext
-XGETTEXT_EXTRA_OPTIONS =
-YACC = bison -y
-YFLAGS =
-abs_builddir = /home/bolek/tmp/commonification/tuxmath/trunk/data/images/menu
-abs_srcdir = /home/bolek/tmp/commonification/tuxmath/trunk/data/images/menu
-abs_top_builddir = /home/bolek/tmp/commonification/tuxmath/trunk
-abs_top_srcdir = /home/bolek/tmp/commonification/tuxmath/trunk
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias =
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias =
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/bolek/tmp/commonification/tuxmath/trunk/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-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_build_prefix = ../../../
-top_builddir = ../../..
-top_srcdir = ../../..
-menudir = $(pkgdatadir)/images/menu
-dist_menu_DATA = \
- alone0.png \
- alone1.png \
- aloned.png \
- alone.svg \
- comet0.png \
- comet1.png \
- comet2.png \
- comet3.png \
- comet4.png \
- comet5.png \
- cometd.png \
- credits0.png \
- credits1.png \
- credits2.png \
- credits3.png \
- creditsd.png \
- exclamation0.png \
- exclamationd.png \
- exclamation.svg \
- factoroids0.png \
- factoroids1.png \
- factoroids2.png \
- factoroidsd.png \
- factoroids.svg \
- factors0.png \
- factors1.png \
- factors2.png \
- factors3.png \
- factors4.png \
- factors5.png \
- factorsd.png \
- fleet0.png \
- fleetd.png \
- fleet.svg \
- fractions0.png \
- fractions1.png \
- fractions2.png \
- fractions3.png \
- fractions4.png \
- fractions5.png \
- fractions6.png \
- fractionsd.png \
- friends0.png \
- friendsd.png \
- friends.svg \
- goldstar0.png \
- goldstar1.png \
- goldstard.png \
- goldstar.svg \
- help.svg \
- help0.png \
- help1.png \
- help2.png \
- help3.png \
- helpd.png \
- lan0.png \
- lan1.png \
- land.png \
- lan.svg \
- lesson0.png \
- lesson1.png \
- lesson2.png \
- lesson3.png \
- lessond.png \
- lesson.svg \
- main0.png \
- main1.png \
- main2.png \
- main3.png \
- main4.png \
- main5.png \
- main6.png \
- main7.png \
- maind.png \
- main.svg \
- no_goldstar0.png \
- no_goldstard.png \
- no_goldstar.svg \
- nums0.png \
- nums1.png \
- nums2.png \
- nums3.png \
- nums4.png \
- nums5.png \
- nums6.png \
- nums7.png \
- numsd.png \
- nums.svg \
- quit0.png \
- quit1.png \
- quit2.png \
- quit3.png \
- quit4.png \
- quit5.png \
- quit6.png \
- quit7.png \
- quit8.png \
- quitd.png \
- quit.svg \
- trophy0.png \
- trophy1.png \
- trophyd.png \
- tux_config.svg \
- tux_config0.png \
- tux_config1.png \
- tux_configd.png \
- tux_config_brown.svg \
- tux_config_brown0.png \
- tux_config_brown1.png \
- tux_config_brownd.png \
- tux_helmet0.png \
- tux_helmet1.png \
- tux_helmet2.png \
- tux_helmetd.png \
- tux_helmet_black.svg \
- tux_helmet_black0.png \
- tux_helmet_blackd.png \
- tux_helmet_blue.svg \
- tux_helmet_blue0.png \
- tux_helmet_blue1.png \
- tux_helmet_blue2.png \
- tux_helmet_blue3.png \
- tux_helmet_blue4.png \
- tux_helmet_blue5.png \
- tux_helmet_blued.png \
- tux_helmet_green.svg \
- tux_helmet_green0.png \
- tux_helmet_green1.png \
- tux_helmet_green2.png \
- tux_helmet_green3.png \
- tux_helmet_green4.png \
- tux_helmet_green5.png \
- tux_helmet_greend.png \
- tux_helmet_red.svg \
- tux_helmet_red0.png \
- tux_helmet_red1.png \
- tux_helmet_red2.png \
- tux_helmet_red3.png \
- tux_helmet_red4.png \
- tux_helmet_red5.png \
- tux_helmet_redd.png \
- tux_helmet_yellow.svg \
- tux_helmet_yellow0.png \
- tux_helmet_yellow1.png \
- tux_helmet_yellow2.png \
- tux_helmet_yellow3.png \
- tux_helmet_yellow4.png \
- tux_helmet_yellow5.png \
- tux_helmet_yellowd.png
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/images/menu/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/images/menu/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-dist_menuDATA: $(dist_menu_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(menudir)" || $(MKDIR_P) "$(DESTDIR)$(menudir)"
- @list='$(dist_menu_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_menuDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(menudir)/$$f'"; \
- $(dist_menuDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(menudir)/$$f"; \
- done
-
-uninstall-dist_menuDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_menu_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(menudir)/$$f'"; \
- rm -f "$(DESTDIR)$(menudir)/$$f"; \
- done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @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; \
- 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; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(menudir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_menuDATA
-
-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
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_menuDATA
-
-.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_menuDATA 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_menuDATA
-
-# 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:
Deleted: branches/commonification/tuxmath/trunk/data/images/menu/Makefile.in
===================================================================
--- branches/commonification/tuxmath/trunk/data/images/menu/Makefile.in 2009-08-07 19:04:09 UTC (rev 1389)
+++ branches/commonification/tuxmath/trunk/data/images/menu/Makefile.in 2009-08-07 19:33:38 UTC (rev 1390)
@@ -1,573 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = data/images/menu
-DIST_COMMON = $(dist_menu_DATA) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(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/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/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
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(menudir)"
-dist_menuDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_menu_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_LIBS = @CAIRO_LIBS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
-LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
-LTLIBC = @LTLIBC@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
-MAKEINFO = @MAKEINFO@
-MINGW32_PACKAGE_DATA_DIR = @MINGW32_PACKAGE_DATA_DIR@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NAME_VERSION = @NAME_VERSION@
-NSIS = @NSIS@
-NSI_DLL_DIR = @NSI_DLL_DIR@
-NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-POW_LIB = @POW_LIB@
-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-RANLIB = @RANLIB@
-RSVG_CFLAGS = @RSVG_CFLAGS@
-RSVG_LIBS = @RSVG_LIBS@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WOE32 = @WOE32@
-WOE32DLL = @WOE32DLL@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-menudir = $(pkgdatadir)/images/menu
-dist_menu_DATA = \
- alone0.png \
- alone1.png \
- aloned.png \
- alone.svg \
- comet0.png \
- comet1.png \
- comet2.png \
- comet3.png \
- comet4.png \
- comet5.png \
- cometd.png \
- credits0.png \
- credits1.png \
- credits2.png \
- credits3.png \
- creditsd.png \
- exclamation0.png \
- exclamationd.png \
- exclamation.svg \
- factoroids0.png \
- factoroids1.png \
- factoroids2.png \
- factoroidsd.png \
- factoroids.svg \
- factors0.png \
- factors1.png \
- factors2.png \
- factors3.png \
- factors4.png \
- factors5.png \
- factorsd.png \
- fleet0.png \
- fleetd.png \
- fleet.svg \
- fractions0.png \
- fractions1.png \
- fractions2.png \
- fractions3.png \
- fractions4.png \
- fractions5.png \
- fractions6.png \
- fractionsd.png \
- friends0.png \
- friendsd.png \
- friends.svg \
- goldstar0.png \
- goldstar1.png \
- goldstard.png \
- goldstar.svg \
- help.svg \
- help0.png \
- help1.png \
- help2.png \
- help3.png \
- helpd.png \
- lan0.png \
- lan1.png \
- land.png \
- lan.svg \
- lesson0.png \
- lesson1.png \
- lesson2.png \
- lesson3.png \
- lessond.png \
- lesson.svg \
- main0.png \
- main1.png \
- main2.png \
- main3.png \
- main4.png \
- main5.png \
- main6.png \
- main7.png \
- maind.png \
- main.svg \
- no_goldstar0.png \
- no_goldstard.png \
- no_goldstar.svg \
- nums0.png \
- nums1.png \
- nums2.png \
- nums3.png \
- nums4.png \
- nums5.png \
- nums6.png \
- nums7.png \
- numsd.png \
- nums.svg \
- quit0.png \
- quit1.png \
- quit2.png \
- quit3.png \
- quit4.png \
- quit5.png \
- quit6.png \
- quit7.png \
- quit8.png \
- quitd.png \
- quit.svg \
- trophy0.png \
- trophy1.png \
- trophyd.png \
- tux_config.svg \
- tux_config0.png \
- tux_config1.png \
- tux_configd.png \
- tux_config_brown.svg \
- tux_config_brown0.png \
- tux_config_brown1.png \
- tux_config_brownd.png \
- tux_helmet0.png \
- tux_helmet1.png \
- tux_helmet2.png \
- tux_helmetd.png \
- tux_helmet_black.svg \
- tux_helmet_black0.png \
- tux_helmet_blackd.png \
- tux_helmet_blue.svg \
- tux_helmet_blue0.png \
- tux_helmet_blue1.png \
- tux_helmet_blue2.png \
- tux_helmet_blue3.png \
- tux_helmet_blue4.png \
- tux_helmet_blue5.png \
- tux_helmet_blued.png \
- tux_helmet_green.svg \
- tux_helmet_green0.png \
- tux_helmet_green1.png \
- tux_helmet_green2.png \
- tux_helmet_green3.png \
- tux_helmet_green4.png \
- tux_helmet_green5.png \
- tux_helmet_greend.png \
- tux_helmet_red.svg \
- tux_helmet_red0.png \
- tux_helmet_red1.png \
- tux_helmet_red2.png \
- tux_helmet_red3.png \
- tux_helmet_red4.png \
- tux_helmet_red5.png \
- tux_helmet_redd.png \
- tux_helmet_yellow.svg \
- tux_helmet_yellow0.png \
- tux_helmet_yellow1.png \
- tux_helmet_yellow2.png \
- tux_helmet_yellow3.png \
- tux_helmet_yellow4.png \
- tux_helmet_yellow5.png \
- tux_helmet_yellowd.png
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/images/menu/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/images/menu/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-dist_menuDATA: $(dist_menu_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(menudir)" || $(MKDIR_P) "$(DESTDIR)$(menudir)"
- @list='$(dist_menu_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_menuDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(menudir)/$$f'"; \
- $(dist_menuDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(menudir)/$$f"; \
- done
-
-uninstall-dist_menuDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_menu_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(menudir)/$$f'"; \
- rm -f "$(DESTDIR)$(menudir)/$$f"; \
- done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @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; \
- 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; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(menudir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_menuDATA
-
-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
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_menuDATA
-
-.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_menuDATA 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_menuDATA
-
-# 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:
Modified: branches/commonification/tuxmath/trunk/data/images/tux/console_bash.png
===================================================================
(Binary files differ)
Modified: branches/commonification/tuxmath/trunk/data/images/tux/console_led.png
===================================================================
(Binary files differ)
Modified: branches/commonification/tuxmath/trunk/src/fileops.h
===================================================================
--- branches/commonification/tuxmath/trunk/src/fileops.h 2009-08-07 19:04:09 UTC (rev 1389)
+++ branches/commonification/tuxmath/trunk/src/fileops.h 2009-08-07 19:33:38 UTC (rev 1390)
@@ -17,6 +17,7 @@
#define FILEOPS_H
#include "globals.h"
+#include "SDL.h"
/* Flag basically telling whether or not to allow admin-level */
/* settings to be changed: */
@@ -205,6 +206,7 @@
int write_postgame_summary(void);
int load_image_data();
+int SetImage(int id, SDL_Rect* rect);
#ifndef NOSOUND
Modified: branches/commonification/tuxmath/trunk/src/fileops_media.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/fileops_media.c 2009-08-07 19:04:09 UTC (rev 1389)
+++ branches/commonification/tuxmath/trunk/src/fileops_media.c 2009-08-07 19:33:38 UTC (rev 1390)
@@ -17,11 +17,9 @@
/* TODO load only "igloo" or "city" files, not both. */
/* TODO get rid of files no longer used. */
-int load_image_data()
-{
- int i;
+static char fn[PATH_MAX];
- static char* image_filenames[NUM_IMAGES] = {
+static char* image_filenames[NUM_IMAGES] = {
"status/title.png",
"status/left.png",
"status/left_gray.png",
@@ -118,7 +116,7 @@
"factoroids/good.png"
};
- static char* sprite_filenames[NUM_IMAGES] = {
+static char* sprite_filenames[NUM_IMAGES] = {
"comets/comet",
"comets/bonus_comet",
"comets/cometex",
@@ -132,11 +130,21 @@
"igloos/steam"
};
- char fn[PATH_MAX];
+int load_image_data()
+{
+ int i;
+
/* Load static images: */
for (i = 0; i < NUM_IMAGES; i++)
{
+ if(images[i])
+ {
+ DEBUGMSG(debug_loaders, "load_image_data(): file %s already loaded\n",
+ image_filenames[i]);
+ continue;
+ }
+
sprintf(fn, "%s%s%s", DATA_PREFIX, "/images/", image_filenames[i]);
images[i] = LoadImage(fn, IMG_ALPHA);
@@ -185,9 +193,31 @@
}
+int SetImage(int id, SDL_Rect* rect)
+{
+ if(images[id])
+ SDL_FreeSurface(images[id]);
+ sprintf(fn, "%s%s%s", DATA_PREFIX, "/images/", image_filenames[id]);
+ if(rect)
+ images[id] = LoadImageOfBoundingBox(fn, IMG_ALPHA, rect->w, rect->h);
+ else
+ images[id] = LoadImage(fn, IMG_ALPHA);
+ if(NULL == images[id])
+ {
+ fprintf(stderr,
+ "\nError: I couldn't load a graphics file:\n"
+ "%s\n"
+ "The Simple DirectMedia error that occured was:\n"
+ "%s\n\n", image_filenames[id], SDL_GetError());
+ return 0;
+ }
+ return 1;
+}
+
+
#ifndef NOSOUND
int load_sound_data(void)
{
Modified: branches/commonification/tuxmath/trunk/src/game.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/game.c 2009-08-07 19:04:09 UTC (rev 1389)
+++ branches/commonification/tuxmath/trunk/src/game.c 2009-08-07 19:33:38 UTC (rev 1390)
@@ -63,6 +63,9 @@
const int SND_IGLOO_SIZZLE = SND_SIZZLE;
const int IMG_CITY_NONE = 0;
+/* positioning constants */
+const float console_pos[4] = {0.4, 0.8, 0.2, 0.2};
+
typedef struct comet_type {
int alive;
int expl;
@@ -190,6 +193,20 @@
static void print_exit_conditions(void);
static void print_status(void);
+
+/* load all game graphics in required sizes,
+ return 0 on failure */
+int PrerenderGraphics()
+{
+ SDL_Rect rt;
+ SetRect(&rt, console_pos);
+ if(!SetImage(IMG_CONSOLE_LED, &rt))
+ return 0;
+ if(!SetImage(IMG_CONSOLE_BASH, &rt))
+ return 0;
+ return 1;
+}
+
/* --- MAIN GAME FUNCTION!!! --- */
Modified: branches/commonification/tuxmath/trunk/src/game.h
===================================================================
--- branches/commonification/tuxmath/trunk/src/game.h 2009-08-07 19:04:09 UTC (rev 1389)
+++ branches/commonification/tuxmath/trunk/src/game.h 2009-08-07 19:33:38 UTC (rev 1390)
@@ -140,6 +140,7 @@
EXTRA_LIFE_ON
};
+int PrerenderGraphics();
int game(void);
void game_set_start_message(const char*, const char*, const char*, const char*);
/* draw_nums() is used in options.c and factoroids.c/h so need extern linkage */
Modified: branches/commonification/tuxmath/trunk/src/loaders.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/loaders.c 2009-08-07 19:04:09 UTC (rev 1389)
+++ branches/commonification/tuxmath/trunk/src/loaders.c 2009-08-07 19:33:38 UTC (rev 1390)
@@ -362,6 +362,7 @@
width = w;
height = h;
}
+ DEBUGMSG(debug_loaders, "load_image(): Resizing %s to %d x %d\n", file_name, width, height);
final_pic = zoom(loaded_pic, width, height);
SDL_FreeSurface(loaded_pic);
loaded_pic = final_pic;
Modified: branches/commonification/tuxmath/trunk/src/setup.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/setup.c 2009-08-07 19:04:09 UTC (rev 1389)
+++ branches/commonification/tuxmath/trunk/src/setup.c 2009-08-07 19:33:38 UTC (rev 1390)
@@ -621,6 +621,13 @@
/* This now has to come after loading the font, because it replaces
a couple of images with translatable versions. */
/* NOTE now the text code will load the font if it isn't already loaded */
+ if(!PrerenderGraphics())
+ {
+ fprintf(stderr, "\nCould not load game image files - exiting!\n");
+ cleanup_on_error();
+ exit(1);
+ }
+
if (!load_image_data())
{
fprintf(stderr, "\nCould not load image file - exiting!\n");
More information about the Tux4kids-commits
mailing list