Use libtool for linking

zoom: Added gate to level; some Makefile.am changes

.hgignore

@@ -0,0 +1,18 @@
+
+syntax: regexp
+^\.deps/
+^\.libs/
+^autom4te.cache/
+^\.project$
+^\.cproject$
+^levels/level.lvl$
+^config.h$
+^config.log$
+^config.status$
+^Makefile$
+^stamp-h1$
+^zoom$
+\.o$
+^zoom-bin$
+^libtool$
+~$

Makefile.am

@@ -1,16 +1,15 @@
-gamesdir              = ${prefix}/games/zoom
+gamedir              = ${prefix}/games/zoom
-nobase_games_SCRIPTS  = zoom
-nobase_games_DATA     = levels/* tex/*
-nobase_games_PROGRAMS = zoom-bin
-zoom_bin_SOURCES      = zoom-bin.c
-zoom_bin_CFLAGS       = @libzoom_CFLAGS@
-zoom_bin_LDADD        = @libzoom_LIBS@
 
-EXTRA_DIST = zoom levels/* tex/*
+bin_SCRIPTS          = zoom
 
-install-exec-local:
+nobase_game_DATA     = levels/level.dtd levels/level.lvl tex/*
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+nobase_game_PROGRAMS = zoom-bin
-	ln -sf $(DESTDIR)${prefix}/games/zoom/zoom $(DESTDIR)$(bindir)/zoom
 
-uninstall-local:
+zoom_bin_SOURCES     = zoom-bin.c
-	rm -f $(DESTDIR)$(bindir)/zoom
+
+EXTRA_DIST           = levels/level.dtd levels/*.xml tex/*
+CLEANFILES           = levels/*.lvl
+
+
+.xml.lvl:
+	gzip -cn9 $< > $@

Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 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,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
+
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,10 +32,71 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+nobase_game_PROGRAMS = zoom-bin$(EXEEXT)
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in $(srcdir)/zoom.in \
+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+	compile config.guess config.sub depcomp install-sh ltmain.sh \
+	missing mkinstalldirs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = zoom
+am__installdirs = "$(DESTDIR)$(gamedir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(gamedir)"
+nobase_gamePROGRAMS_INSTALL = $(install_sh_PROGRAM)
+PROGRAMS = $(nobase_game_PROGRAMS)
+am_zoom_bin_OBJECTS = zoom-bin.$(OBJEXT)
+zoom_bin_OBJECTS = $(am_zoom_bin_OBJECTS)
+zoom_bin_LDADD = $(LDADD)
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS)
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(zoom_bin_SOURCES)
+DIST_SOURCES = $(zoom_bin_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|^.*/||'`;
+nobase_gameDATA_INSTALL = $(install_sh_DATA)
+DATA = $(nobase_game_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -46,14 +104,26 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -61,11 +131,13 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -75,24 +147,41 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+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@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ac_ct_F77 = @ac_ct_F77@
 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@
@@ -104,6 +193,7 @@ libzoom_LIBS = @libzoom_LIBS@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -111,226 +201,193 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-gamesdir = ${prefix}/games/zoom
+top_builddir = @top_builddir@
-nobase_games_SCRIPTS = zoom
+top_srcdir = @top_srcdir@
-nobase_games_DATA = levels/* tex/*
+gamedir = ${prefix}/games/zoom
-nobase_games_PROGRAMS = zoom-bin
+bin_SCRIPTS = zoom
+nobase_game_DATA = levels/level.dtd levels/level.lvl tex/*
 zoom_bin_SOURCES = zoom-bin.c
-zoom_bin_CFLAGS = @libzoom_CFLAGS@
+EXTRA_DIST = levels/level.dtd levels/*.xml tex/*
-zoom_bin_LDADD = @libzoom_LIBS@
+CLEANFILES = levels/*.lvl
-
-EXTRA_DIST = zoom levels/* tex/*
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-nobase_games_PROGRAMS = zoom-bin$(EXEEXT)
-PROGRAMS = $(nobase_games_PROGRAMS)
-
-am_zoom_bin_OBJECTS = zoom_bin-zoom-bin.$(OBJEXT)
-zoom_bin_OBJECTS = $(am_zoom_bin_OBJECTS)
-zoom_bin_DEPENDENCIES =
-zoom_bin_LDFLAGS =
-SCRIPTS = $(nobase_games_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/zoom_bin-zoom-bin.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(zoom_bin_SOURCES)
-DATA = $(nobase_games_DATA)
-
-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
-	COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 compile \
-	config.h.in configure configure.in depcomp install-sh missing \
-	mkinstalldirs
-SOURCES = $(zoom_bin_SOURCES)
-
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .o .obj
+.SUFFIXES: .c .lo .lvl .o .obj .xml
-
+am--refresh:
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+	@:
- configure.lineno
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+.PRECIOUS: Makefile
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
 
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/config.h.in
+	rm -f stamp-h1
+	touch $@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-nobase_gamesPROGRAMS_INSTALL = $(install_sh_PROGRAM)
+zoom: $(top_builddir)/config.status $(srcdir)/zoom.in
-install-nobase_gamesPROGRAMS: $(nobase_games_PROGRAMS)
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+install-nobase_gamePROGRAMS: $(nobase_game_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(gamesdir)
+	test -z "$(gamedir)" || $(MKDIR_P) "$(DESTDIR)$(gamedir)"
-	@list='$(nobase_games_PROGRAMS)'; for p in $$list; do \
+	@list='$(nobase_game_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
+	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 	    f=`echo "$$p1" | sed 's|[^/]*$$||'`"$$f"; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(nobase_gamesPROGRAMS_INSTALL) $$p $(DESTDIR)$(gamesdir)/$$f"; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(nobase_gamePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(gamedir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(nobase_gamesPROGRAMS_INSTALL) $$p $(DESTDIR)$(gamesdir)/$$f || exit 1; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(nobase_gamePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(gamedir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
-uninstall-nobase_gamesPROGRAMS:
+uninstall-nobase_gamePROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_games_PROGRAMS)'; for p in $$list; do \
+	@list='$(nobase_game_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
 	  f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
-	  echo " rm -f $(DESTDIR)$(gamesdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(gamedir)/$$f'"; \
-	  rm -f $(DESTDIR)$(gamesdir)/$$f; \
+	  rm -f "$(DESTDIR)$(gamedir)/$$f"; \
 	done
 
-clean-nobase_gamesPROGRAMS:
+clean-nobase_gamePROGRAMS:
-	-test -z "$(nobase_games_PROGRAMS)" || rm -f $(nobase_games_PROGRAMS)
+	@list='$(nobase_game_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
 zoom-bin$(EXEEXT): $(zoom_bin_OBJECTS) $(zoom_bin_DEPENDENCIES) 
 	@rm -f zoom-bin$(EXEEXT)
-	$(LINK) $(zoom_bin_LDFLAGS) $(zoom_bin_OBJECTS) $(zoom_bin_LDADD) $(LIBS)
+	$(LINK) $(zoom_bin_OBJECTS) $(zoom_bin_LDADD) $(LIBS)
-nobase_gamesSCRIPT_INSTALL = $(install_sh_SCRIPT)
+install-binSCRIPTS: $(bin_SCRIPTS)
-install-nobase_gamesSCRIPTS: $(nobase_games_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(gamesdir)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(nobase_games_SCRIPTS)'; for p in $$list; do \
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
+	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    echo " $(nobase_gamesSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(gamesdir)/$$f"; \
+	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-	    $(nobase_gamesSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(gamesdir)/$$f; \
 	  else :; fi; \
 	done
 
-uninstall-nobase_gamesSCRIPTS:
+uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_games_SCRIPTS)'; for p in $$list; do \
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  echo " rm -f $(DESTDIR)$(gamesdir)/$$f"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(gamesdir)/$$f; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom_bin-zoom-bin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom-bin.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
-zoom_bin-zoom-bin.o: zoom-bin.c
+.c.lo:
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -MT zoom_bin-zoom-bin.o -MD -MP -MF "$(DEPDIR)/zoom_bin-zoom-bin.Tpo" \
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	  -c -o zoom_bin-zoom-bin.o `test -f 'zoom-bin.c' || echo '$(srcdir)/'`zoom-bin.c; \
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zoom_bin-zoom-bin.Tpo" "$(DEPDIR)/zoom_bin-zoom-bin.Po"; \
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/zoom_bin-zoom-bin.Tpo"; exit 1; \
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zoom-bin.c' object='zoom_bin-zoom-bin.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zoom_bin-zoom-bin.Po' tmpdepfile='$(DEPDIR)/zoom_bin-zoom-bin.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -c -o zoom_bin-zoom-bin.o `test -f 'zoom-bin.c' || echo '$(srcdir)/'`zoom-bin.c
 
-zoom_bin-zoom-bin.obj: zoom-bin.c
+mostlyclean-libtool:
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -MT zoom_bin-zoom-bin.obj -MD -MP -MF "$(DEPDIR)/zoom_bin-zoom-bin.Tpo" \
+	-rm -f *.lo
-@am__fastdepCC_TRUE@	  -c -o zoom_bin-zoom-bin.obj `if test -f 'zoom-bin.c'; then $(CYGPATH_W) 'zoom-bin.c'; else $(CYGPATH_W) '$(srcdir)/zoom-bin.c'; fi`; \
+
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zoom_bin-zoom-bin.Tpo" "$(DEPDIR)/zoom_bin-zoom-bin.Po"; \
+clean-libtool:
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/zoom_bin-zoom-bin.Tpo"; exit 1; \
+	-rm -rf .libs _libs
-@am__fastdepCC_TRUE@	fi
+
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zoom-bin.c' object='zoom_bin-zoom-bin.obj' libtool=no @AMDEPBACKSLASH@
+distclean-libtool:
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/zoom_bin-zoom-bin.Po' tmpdepfile='$(DEPDIR)/zoom_bin-zoom-bin.TPo' @AMDEPBACKSLASH@
+	-rm -f libtool
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+install-nobase_gameDATA: $(nobase_game_DATA)
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -c -o zoom_bin-zoom-bin.obj `if test -f 'zoom-bin.c'; then $(CYGPATH_W) 'zoom-bin.c'; else $(CYGPATH_W) '$(srcdir)/zoom-bin.c'; fi`
-uninstall-info-am:
-nobase_gamesDATA_INSTALL = $(install_sh_DATA)
-install-nobase_gamesDATA: $(nobase_games_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(gamesdir)
+	test -z "$(gamedir)" || $(MKDIR_P) "$(DESTDIR)$(gamedir)"
-	@list='$(nobase_games_DATA)'; for p in $$list; do \
+	@$(am__vpath_adj_setup) \
+	list='$(nobase_game_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="$$p"; \
+	  $(am__vpath_adj) \
-	  echo " $(nobase_gamesDATA_INSTALL) $$d$$p $(DESTDIR)$(gamesdir)/$$f"; \
+	  echo " $(nobase_gameDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gamedir)/$$f'"; \
-	  $(nobase_gamesDATA_INSTALL) $$d$$p $(DESTDIR)$(gamesdir)/$$f; \
+	  $(nobase_gameDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gamedir)/$$f"; \
 	done
 
-uninstall-nobase_gamesDATA:
+uninstall-nobase_gameDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_games_DATA)'; for p in $$list; do \
+	@$(am__vpath_adj_setup) \
-	  f="$$p"; \
+	list='$(nobase_game_DATA)'; for p in $$list; do \
-	  echo " rm -f $(DESTDIR)$(gamesdir)/$$f"; \
+	  $(am__vpath_adj) \
-	  rm -f $(DESTDIR)$(gamesdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(gamedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(gamedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	       END { for (i in files) print i; }'`; \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -340,23 +397,23 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	       END { for (i in files) print i; }'`; \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	  test -n "$$unique" || unique=$$empty_fix; \
-	     $$tags $$unique
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	       END { for (i in files) print i; }'`; \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -368,40 +425,25 @@ GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
+	test -d $(distdir) || mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/levels $(distdir)/tex
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	  case $$file in \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	case $$dist_files in \
-	  esac; \
+	  */*) $(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"; \
-	    $(mkinstalldirs) "$(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; \
@@ -415,22 +457,55 @@ distdir: $(DISTFILES)
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-	$(am__remove_distdir)
+	case '$(DIST_ARCHIVES)' in \
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
 	chmod -R a-w $(distdir); chmod a+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
@@ -450,19 +525,20 @@ distcheck: dist
 	        distuninstallcheck \
 	  && chmod -R a-w "$$dc_install_base" \
 	  && ({ \
-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
 	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -f $(distdir).tar.gz \
+	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
 	$(am__remove_distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
+	@(echo "$(distdir) archives ready for distribution: "; \
-	  sed 'h;s/./=/g;p;x;p;x'
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -484,9 +560,10 @@ distcleancheck: distclean
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(gamesdir) $(DESTDIR)$(gamesdir) $(DESTDIR)$(gamesdir)
+	for dir in "$(DESTDIR)$(gamedir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gamedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -504,41 +581,52 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-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 clean-nobase_gamesPROGRAMS mostlyclean-am
+clean-am: clean-generic clean-libtool clean-nobase_gamePROGRAMS \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
+distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-hdr distclean-libtool distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
-install-data-am: install-nobase_gamesDATA install-nobase_gamesPROGRAMS \
+install-data-am: install-nobase_gameDATA install-nobase_gamePROGRAMS
-	install-nobase_gamesSCRIPTS
 
-install-exec-am: install-exec-local
+install-dvi: install-dvi-am
+
+install-exec-am: install-binSCRIPTS
+
+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
@@ -550,7 +638,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -560,33 +649,33 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local \
+uninstall-am: uninstall-binSCRIPTS uninstall-nobase_gameDATA \
-	uninstall-nobase_gamesDATA uninstall-nobase_gamesPROGRAMS \
+	uninstall-nobase_gamePROGRAMS
-	uninstall-nobase_gamesSCRIPTS
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+.MAKE: install-am install-strip
-	clean-nobase_gamesPROGRAMS ctags dist dist-all dist-gzip \
+
-	distcheck distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	distclean-hdr distclean-tags distcleancheck distdir \
+	clean-generic clean-libtool clean-nobase_gamePROGRAMS ctags \
-	distuninstallcheck dvi dvi-am info info-am install install-am \
+	dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
-	install-data install-data-am install-exec install-exec-am \
+	dist-tarZ dist-zip distcheck distclean distclean-compile \
-	install-exec-local install-info install-info-am install-man \
+	distclean-generic distclean-hdr distclean-libtool \
-	install-nobase_gamesDATA install-nobase_gamesPROGRAMS \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	install-nobase_gamesSCRIPTS install-strip installcheck \
+	dvi-am html html-am info info-am install install-am \
-	installcheck-am installdirs maintainer-clean \
+	install-binSCRIPTS install-data install-data-am install-dvi \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	install-dvi-am install-exec install-exec-am install-html \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	install-html-am install-info install-info-am install-man \
-	uninstall-am uninstall-info-am uninstall-local \
+	install-nobase_gameDATA install-nobase_gamePROGRAMS \
-	uninstall-nobase_gamesDATA uninstall-nobase_gamesPROGRAMS \
+	install-pdf install-pdf-am install-ps install-ps-am \
-	uninstall-nobase_gamesSCRIPTS
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binSCRIPTS uninstall-nobase_gameDATA \
+	uninstall-nobase_gamePROGRAMS
 
 
-install-exec-local:
+.xml.lvl:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	gzip -cn9 $< > $@
-	ln -sf $(DESTDIR)${prefix}/games/zoom/zoom $(DESTDIR)$(bindir)/zoom
-
-uninstall-local:
-	rm -f $(DESTDIR)$(bindir)/zoom
 # 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:

config.h.in

@@ -1,7 +1,37 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if you have the `gettimeofday' function. */
+/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_GETTIMEOFDAY
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
 
 /* Name of package */
 #undef PACKAGE
@@ -21,6 +51,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 

configure.ac

@@ -4,25 +4,30 @@
 AC_PREREQ(2.59)
 AC_INIT(zoom, 0.1, matthias@gamezock.de)
 AC_CONFIG_SRCDIR([zoom-bin.c])
-AC_CONFIG_HEADER([config.h])
+AM_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_LIBTOOL
+AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
 
 # Checks for libraries.
 PKG_CHECK_MODULES(libzoom, libzoom-0.1, , AC_MSG_ERROR(Test for libzoom failed.))
 
+CFLAGS="$libzoom_CFLAGS $CFLAGS"
+LIBS="$libzoom_LIBS $LIBS"
+
 # Checks for header files.
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_TIME
 
 # Checks for library functions.
-AC_CHECK_FUNCS([gettimeofday])
+#AC_CHECK_FUNCS([gettimeofday])
 
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+AC_OUTPUT([zoom])

levels/level.dtd

@@ -0,0 +1,61 @@
+<!ELEMENT level (info, rooms, gates, textures)>
+
+<!ELEMENT info (name, desc, start)>
+<!ELEMENT rooms (room)*>
+<!ELEMENT gates (gate)*>
+<!ELEMENT textures (texture)*>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT desc (#PCDATA)>
+<!ELEMENT start EMPTY>
+<!ATTLIST start
+  x CDATA #REQUIRED
+  y CDATA #REQUIRED
+  z CDATA #REQUIRED
+>
+
+<!ELEMENT room (triangle)*>
+<!ATTLIST room
+  id ID #REQUIRED
+>
+
+<!ELEMENT gate (triangle)*>
+<!ATTLIST gate
+  room1 IDREF #REQUIRED
+  room2 IDREF #REQUIRED
+>
+
+<!ELEMENT triangle (vertex, normal?, texcoords?, vertex, normal?, texcoords?, vertex, normal?, texcoords?)>
+<!ATTLIST triangle
+  visible (true|false) "true"
+  texture IDREF        #IMPLIED
+>
+
+<!ELEMENT texture EMPTY>
+<!ATTLIST texture
+  id   ID    #REQUIRED
+  name CDATA #REQUIRED
+>
+
+<!ELEMENT vertex EMPTY>
+<!ATTLIST vertex
+  x CDATA #REQUIRED
+  y CDATA #REQUIRED
+  z CDATA #REQUIRED
+>
+
+<!ELEMENT normal EMPTY>
+<!ATTLIST normal
+  x CDATA #REQUIRED
+  y CDATA #REQUIRED
+  z CDATA #REQUIRED
+>
+
+<!ELEMENT texcoords EMPTY>
+<!ATTLIST texcoords
+  s CDATA #REQUIRED
+  t CDATA #IMPLIED
+  r CDATA #IMPLIED
+  q CDATA #IMPLIED
+>
+

levels/level.xml

@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE level PUBLIC "-//libzoom//DTD level 0.1//EN" "level.dtd">
+<level>
+  <info>
+    <name>Test Level</name>
+    <desc>Just a simple test level.</desc>
+    <start x="0.0" y="0.0" z="0.0"/>
+  </info>
+  <rooms>
+    <room id="r0">
+      <triangle texture="t0">
+        <vertex x="-2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-6.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-6.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="-2.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="-2.0" z="2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="2.0" y="2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="-2.0" z="2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="-2.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="-2.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="2.0" z="2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t2">
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t2">
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="-2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t2">
+        <vertex x="-2.0" y="-2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t2">
+        <vertex x="-2.0" y="-2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="-2.0" y="2.0" z="-6.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="-2.0" y="-2.0" z="2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t2">
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="6.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="6.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t2">
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="6.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t2">
+        <vertex x="2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="6.0" y="-2.0" z="-6.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="6.0" y="-2.0" z="-10.0"/>
+        <texcoords s="1.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t2">
+        <vertex x="2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="6.0" y="-2.0" z="-10.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="-2.0" z="-10.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="6.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="2.0" y="2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-10.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-10.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="2.0" y="2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-10.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="6.0" y="2.0" z="-6.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="-10.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="6.0" y="-2.0" z="-10.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-10.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="-10.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-10.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="2.0" y="2.0" z="-10.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="-10.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-10.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="2.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="-10.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="-6.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="6.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-6.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="6.0" y="2.0" z="-10.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="6.0" y="-2.0" z="-6.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-10.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="6.0" y="-2.0" z="-10.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="6.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="6.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="6.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-6.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="6.0" y="-2.0" z="-6.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+    </room>
+    <room id="r1">
+      <triangle texture="t2">
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="-2.0" y="-2.0" z="2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="-2.0" z="2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t2">
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="-2.0" y="-2.0" z="2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="2.0" y="2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="2.0" y="-2.0" z="2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="-2.0" y="-2.0" z="2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="-2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="-2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+      <triangle texture="t1">
+        <vertex x="-2.0" y="2.0" z="2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+    </room>
+  </rooms>
+  <gates>
+    <gate room1="r0" room2="r1">
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="2.0" y="2.0" z="-2.0"/>
+        <texcoords s="1.0" t="0.0"/>
+        <vertex x="6.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+      </triangle>
+      <triangle texture="t0">
+        <vertex x="2.0" y="-2.0" z="-2.0"/>
+        <texcoords s="1.0" t="1.0"/>
+        <vertex x="6.0" y="2.0" z="-2.0"/>
+        <texcoords s="0.0" t="0.0"/>
+        <vertex x="6.0" y="-2.0" z="-2.0"/>
+        <texcoords s="0.0" t="1.0"/>
+      </triangle>
+    </gate>
+  </gates>
+  <textures>
+    <texture id="t0" name="green.png"/>
+    <texture id="t1" name="metallic2.png"/>
+    <texture id="t2" name="light.png"/>
+  </textures>
+</level>

levels/level1.txt

@@ -1,122 +0,0 @@
-room
-	triangle wall
-		vertices
-			-10 -10 -10
-			10 -10 -10
-			10 10 -10
-		texture blue.png
-			0 0
-			10 0
-			10 10
-	end
-	triangle wall
-		vertices
-			-10 -10 -10
-			10 10 -10
-			-10 10 -10
-		texture blue.png
-			0 0
-			10 10
-			0 10
-	end
-	triangle wall
-		vertices
-			-10 -10 10
-			-10 10 10
-			10 10 10
-		texture blue.png
-			10 10
-			0 10
-			0 0
-	end
-	triangle wall
-		vertices
-			-10 -10 10
-			10 10 10
-			10 -10 10
-		texture blue.png
-			10 10
-			0 0
-			10 0
-	end
-	triangle wall
-		vertices
-			-10 10 -10
-			10 10 -10
-			10 10 10
-		texture blue.png
-			0 0
-			10 0
-			10 10
-	end
-	triangle wall
-		vertices
-			-10 10 -10
-			10 10 10
-			-10 10 10
-		texture blue.png
-			0 0
-			10 10
-			0 10
-	end
-	triangle floor
-		vertices
-			-10 -10 10
-			10 -10 10
-			10 -10 -10
-		texture blue.png
-			0 10
-			10 10
-			10 0
-	end
-	triangle floor
-		vertices
-			-10 -10 10
-			10 -10 -10
-			-10 -10 -10
-		texture blue.png
-			0 10
-			10 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-10 -10 -10
-			-10 10 -10
-			-10 10 10
-		texture blue.png
-			10 10
-			10 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-10 -10 -10
-			-10 10 10
-			-10 -10 10
-		texture blue.png
-			10 10
-			0 0
-			0 10
-	end
-	triangle wall
-		vertices
-			10 -10 10
-			10 10 10
-			10 10 -10
-		texture blue.png
-			10 10
-			10 0
-			0 0
-	end
-	triangle wall
-		vertices
-			10 -10 10
-			10 10 -10
-			10 -10 -10
-		texture blue.png
-			10 10
-			0 0
-			0 10
-	end
-end

levels/level2.txt

@@ -1,266 +0,0 @@
-room
-	triangle wall
-		vertices
-			-2 -2 -6
-			2 -2 -6
-			2 2 -6
-		texture green.png
-			0 1
-			1 1
-			1 0
-	end
-	triangle wall
-		vertices
-			-2 -2 -6
-			2 2 -6
-			-2 2 -6
-		texture green.png
-			0 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-2 -2 2
-			-2 2 2
-			2 2 2
-		texture green.png
-			1 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-2 -2 2
-			2 2 2
-			2 -2 2
-		texture green.png
-			1 1
-			0 0
-			0 1
-	end
-	triangle wall
-		vertices
-			-2 2 -6
-			2 2 -6
-			2 2 -2
-		texture metallic.png
-			0 1
-			0 0
-			2 0
-	end
-	triangle wall
-		vertices
-			-2 2 -6
-			2 2 -2
-			-2 2 -2
-		texture metallic.png
-			0 1
-			2 0
-			2 1
-	end
-	triangle wall
-		vertices
-			-2 2 -2
-			2 2 -2
-			2 2 2
-		texture metallic.png
-			0 1
-			0 0
-			2 0
-	end
-	triangle wall
-		vertices
-			-2 2 -2
-			2 2 2
-			-2 2 2
-		texture metallic.png
-			0 1
-			2 0
-			2 1
-	end
-	triangle floor
-		vertices
-			-2 -2 2
-			2 -2 2
-			2 -2 -6
-		texture light.png
-			0 0
-			0 1
-			2 1
-	end
-	triangle floor
-		vertices
-			-2 -2 2
-			2 -2 -6
-			-2 -2 -6
-		texture light.png
-			0 0
-			2 1
-			2 0
-	end
-	triangle wall
-		vertices
-			-2 -2 -6
-			-2 2 -6
-			-2 2 2
-		texture green.png
-			2 1
-			2 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-2 -2 -6
-			-2 2 2
-			-2 -2 2
-		texture green.png
-			2 1
-			0 0
-			0 1
-	end
-	triangle wall
-		vertices
-			2 -2 2
-			2 2 2
-			2 2 -2
-		texture green.png
-			1 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			2 -2 2
-			2 2 -2
-			2 -2 -2
-		texture green.png
-			1 1
-			0 0
-			0 1
-	end
-	triangle floor
-		vertices
-			2 -2 -2
-			6 -2 -2
-			6 -2 -10
-		texture light.png
-			0 0
-			0 1
-			2 1
-	end
-	triangle floor
-		vertices
-			2 -2 -2
-			6 -2 -10
-			2 -2 -10
-		texture light.png
-			0 0
-			2 1
-			2 0
-	end
-	triangle wall
-		vertices
-			2 2 -2
-			2 2 -10
-			6 2 -10
-		texture metallic.png
-			2 1
-			0 1
-			0 0
-	end
-	triangle wall
-		vertices
-			2 2 -2
-			6 2 -10
-			6 2 -2
-		texture metallic.png
-			2 1
-			0 0
-			2 0
-	end
-	triangle wall
-		vertices
-			2 -2 -10
-			6 -2 -10
-			6 2 -10
-		texture green.png
-			0 1
-			1 1
-			1 0
-	end
-	triangle wall
-		vertices
-			2 -2 -10
-			6 2 -10
-			2 2 -10
-		texture green.png
-			0 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			2 -2 -10
-			2 2 -10
-			2 2 -6
-		texture green.png
-			1 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			2 -2 -10
-			2 2 -6
-			2 -2 -6
-		texture green.png
-			1 1
-			0 0
-			0 1
-	end
-	triangle wall
-		vertices
-			2 -2 -2
-			2 2 -2
-			6 2 -2
-		texture green.png
-			1 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			2 -2 -2
-			6 2 -2
-			6 -2 -2
-		texture green.png
-			1 1
-			0 0
-			0 1
-	end
-	triangle wall
-		vertices
-			6 -2 -2
-			6 2 -2
-			6 2 -10
-		texture green.png
-			2 1
-			2 0
-			0 0
-	end
-	triangle wall
-		vertices
-			6 -2 -2
-			6 2 -10
-			6 -2 -10
-		texture green.png
-			2 1
-			0 0
-			0 1
-	end
-	object medipak100
-		4 -1 -8
-	object medipak100
-		4 -1 -4
-end

zoom

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-zoomexec=`readlink -f $0`
-
-if [ -z $zoomexec ]
-  then zoomdir=`dirname $0`
-  else zoomdir=`dirname $zoomexec`
-fi
-
-cd $zoomdir
-exec ./zoom-bin

zoom-bin.c

@@ -3,7 +3,7 @@
 #include <X11/keysym.h>
 #include <GL/gl.h>
 #include <GL/glx.h>
-#include <time.h>
+#include <sys/time.h>
 #include <zoom/init.h>
 #include <zoom/render.h>
 #include <zoom/player.h>
@@ -25,7 +25,6 @@ void GLXinit();
 void GLXinit() {
 	char *str = "Zoom";
 	XTextProperty name;
-	XWMHints wmhints;
 	XSizeHints shints;
 	XClassHint chint;
 	XVisualInfo *vi;
@@ -150,7 +149,7 @@ int main() {
 		frames++;
 		tocks += delta*1000;
 		if(tocks > 1000000) {
-			fprintf(stderr, "%u\n", frames);
+			fprintf(stderr, "%lu\n", frames);
 			frames = 0;
 			tocks -= 1000000;
 		}

zoom.in

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd @prefix@/games/zoom
+exec ./zoom-bin