Changed CFLAGS/LIBS usage

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

.hgignore

@@ -0,0 +1,20 @@
+
+syntax: regexp
+^\.deps/
+^\.libs/
+^\.cproject$
+^\.project$
+^config.h$
+^config.log$
+^config.status$
+^libtool$
+\.o$
+\.lo$
+^libzoom.la$
+^libzoom-0.1.pc$
+^Makefile$
+^stamp-h1$
+
+syntax: regexp
+^autom4te\.cache/
+~$

Makefile.am

@@ -1,5 +1,9 @@
-lib_LTLIBRARIES	           = libzoom.la
+lib_LTLIBRARIES	          = libzoom.la
-libzoom_la_SOURCES         = init.c level.c player.c render.c texture.c light.c
+libzoom_la_SOURCES        = init.c level.c player.c render.c texture.c light.c
-libzoom_la_CFLAGS          = @GL_CFLAGS@ @GLU_CFLAGS@ @LIBPNG_CFLAGS@
+libzoom_la_LDFLAGS        = -version-info 0:0:0 -release 0.1
-libzoom_la_LIBADD          = @GL_LIBS@ @GLU_LIBS@ @LIBPNG_LIBS@
+
-nobase_include_HEADERS     = zoom/types.h zoom/init.h zoom/level.h zoom/player.h zoom/render.h zoom/texture.h zoom/light.h
+library_includedir        = $(includedir)/libzoom-0.1/zoom
+library_include_HEADERS   = zoom/types.h zoom/init.h zoom/level.h zoom/player.h zoom/render.h zoom/texture.h zoom/light.h
+
+pkgconfigdir              = $(libdir)/pkgconfig
+pkgconfig_DATA            = libzoom-0.1.pc

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,74 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(srcdir)/libzoom-0.1.pc.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)/acinclude.m4 \
+	$(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 = libzoom-0.1.pc
+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)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(library_includedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libzoom_la_LIBADD =
+am_libzoom_la_OBJECTS = init.lo level.lo player.lo render.lo \
+	texture.lo light.lo
+libzoom_la_OBJECTS = $(am_libzoom_la_OBJECTS)
+libzoom_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libzoom_la_LDFLAGS) $(LDFLAGS) -o $@
+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 = $(libzoom_la_SOURCES)
+DIST_SOURCES = $(libzoom_la_SOURCES)
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgconfig_DATA)
+library_includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(library_include_HEADERS)
+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@
@@ -70,22 +131,20 @@ GLU_LIBS = @GLU_LIBS@
 GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
-LIBPNG_LIBS = @LIBPNG_LIBS@
 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@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -104,23 +163,26 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XMKMF = @XMKMF@
+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@
 ac_ct_F77 = @ac_ct_F77@
 acx_pthread_config = @acx_pthread_config@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 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@
@@ -137,9 +199,16 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libneofx_CFLAGS = @libneofx_CFLAGS@
+libneofx_LIBS = @libneofx_LIBS@
+libpng_CFLAGS = @libpng_CFLAGS@
+libpng_LIBS = @libpng_LIBS@
+libxml2_CFLAGS = @libxml2_CFLAGS@
+libxml2_LIBS = @libxml2_LIBS@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -147,365 +216,138 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = libzoom.la
 libzoom_la_SOURCES = init.c level.c player.c render.c texture.c light.c
-libzoom_la_CFLAGS = @GL_CFLAGS@ @GLU_CFLAGS@ @LIBPNG_CFLAGS@
+libzoom_la_LDFLAGS = -version-info 0:0:0 -release 0.1
-libzoom_la_LIBADD = @GL_LIBS@ @GLU_LIBS@ @LIBPNG_LIBS@
+library_includedir = $(includedir)/libzoom-0.1/zoom
-nobase_include_HEADERS = zoom/types.h zoom/init.h zoom/level.h zoom/player.h zoom/render.h zoom/texture.h zoom/light.h
+library_include_HEADERS = zoom/types.h zoom/init.h zoom/level.h zoom/player.h zoom/render.h zoom/texture.h zoom/light.h
-subdir = .
+pkgconfigdir = $(libdir)/pkgconfig
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+pkgconfig_DATA = libzoom-0.1.pc
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libzoom_la_LDFLAGS =
-libzoom_la_DEPENDENCIES =
-am_libzoom_la_OBJECTS = libzoom_la-init.lo libzoom_la-level.lo \
-	libzoom_la-player.lo libzoom_la-render.lo libzoom_la-texture.lo \
-	libzoom_la-light.lo
-libzoom_la_OBJECTS = $(am_libzoom_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libzoom_la-init.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libzoom_la-level.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libzoom_la-light.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libzoom_la-player.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libzoom_la-render.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libzoom_la-texture.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libzoom_la_SOURCES)
-HEADERS = $(nobase_include_HEADERS)
-
-DIST_COMMON = README $(nobase_include_HEADERS) $(srcdir)/Makefile.in \
-	$(srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
-	Makefile.am NEWS acinclude.m4 aclocal.m4 compile config.guess \
-	config.h.in config.sub configure configure.in depcomp \
-	install-sh ltmain.sh missing mkinstalldirs
-SOURCES = $(libzoom_la_SOURCES)
-
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-
+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 acinclude.m4
+$(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
-libLTLIBRARIES_INSTALL = $(INSTALL)
+libzoom-0.1.pc: $(top_builddir)/config.status $(srcdir)/libzoom-0.1.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libzoom.la: $(libzoom_la_OBJECTS) $(libzoom_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libzoom_la_LDFLAGS) $(libzoom_la_OBJECTS) $(libzoom_la_LIBADD) $(LIBS)
+	$(libzoom_la_LINK) -rpath $(libdir) $(libzoom_la_OBJECTS) $(libzoom_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzoom_la-init.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzoom_la-level.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/level.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzoom_la-light.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzoom_la-player.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzoom_la-render.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/render.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzoom_la-texture.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Plo@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`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -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)/$*.Plo
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-libzoom_la-init.o: init.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-init.o -MD -MP -MF "$(DEPDIR)/libzoom_la-init.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-init.Tpo" "$(DEPDIR)/libzoom_la-init.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-init.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='init.c' object='libzoom_la-init.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-init.Po' tmpdepfile='$(DEPDIR)/libzoom_la-init.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c
-
-libzoom_la-init.obj: init.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-init.obj -MD -MP -MF "$(DEPDIR)/libzoom_la-init.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-init.obj `if test -f 'init.c'; then $(CYGPATH_W) 'init.c'; else $(CYGPATH_W) '$(srcdir)/init.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-init.Tpo" "$(DEPDIR)/libzoom_la-init.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-init.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='init.c' object='libzoom_la-init.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-init.Po' tmpdepfile='$(DEPDIR)/libzoom_la-init.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-init.obj `if test -f 'init.c'; then $(CYGPATH_W) 'init.c'; else $(CYGPATH_W) '$(srcdir)/init.c'; fi`
-
-libzoom_la-init.lo: init.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-init.lo -MD -MP -MF "$(DEPDIR)/libzoom_la-init.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-init.lo `test -f 'init.c' || echo '$(srcdir)/'`init.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-init.Tpo" "$(DEPDIR)/libzoom_la-init.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-init.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='init.c' object='libzoom_la-init.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-init.Plo' tmpdepfile='$(DEPDIR)/libzoom_la-init.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-init.lo `test -f 'init.c' || echo '$(srcdir)/'`init.c
-
-libzoom_la-level.o: level.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-level.o -MD -MP -MF "$(DEPDIR)/libzoom_la-level.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-level.o `test -f 'level.c' || echo '$(srcdir)/'`level.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-level.Tpo" "$(DEPDIR)/libzoom_la-level.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-level.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='level.c' object='libzoom_la-level.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-level.Po' tmpdepfile='$(DEPDIR)/libzoom_la-level.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-level.o `test -f 'level.c' || echo '$(srcdir)/'`level.c
-
-libzoom_la-level.obj: level.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-level.obj -MD -MP -MF "$(DEPDIR)/libzoom_la-level.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-level.obj `if test -f 'level.c'; then $(CYGPATH_W) 'level.c'; else $(CYGPATH_W) '$(srcdir)/level.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-level.Tpo" "$(DEPDIR)/libzoom_la-level.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-level.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='level.c' object='libzoom_la-level.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-level.Po' tmpdepfile='$(DEPDIR)/libzoom_la-level.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-level.obj `if test -f 'level.c'; then $(CYGPATH_W) 'level.c'; else $(CYGPATH_W) '$(srcdir)/level.c'; fi`
-
-libzoom_la-level.lo: level.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-level.lo -MD -MP -MF "$(DEPDIR)/libzoom_la-level.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-level.lo `test -f 'level.c' || echo '$(srcdir)/'`level.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-level.Tpo" "$(DEPDIR)/libzoom_la-level.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-level.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='level.c' object='libzoom_la-level.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-level.Plo' tmpdepfile='$(DEPDIR)/libzoom_la-level.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-level.lo `test -f 'level.c' || echo '$(srcdir)/'`level.c
-
-libzoom_la-player.o: player.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-player.o -MD -MP -MF "$(DEPDIR)/libzoom_la-player.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-player.o `test -f 'player.c' || echo '$(srcdir)/'`player.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-player.Tpo" "$(DEPDIR)/libzoom_la-player.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-player.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='player.c' object='libzoom_la-player.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-player.Po' tmpdepfile='$(DEPDIR)/libzoom_la-player.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-player.o `test -f 'player.c' || echo '$(srcdir)/'`player.c
-
-libzoom_la-player.obj: player.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-player.obj -MD -MP -MF "$(DEPDIR)/libzoom_la-player.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-player.obj `if test -f 'player.c'; then $(CYGPATH_W) 'player.c'; else $(CYGPATH_W) '$(srcdir)/player.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-player.Tpo" "$(DEPDIR)/libzoom_la-player.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-player.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='player.c' object='libzoom_la-player.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-player.Po' tmpdepfile='$(DEPDIR)/libzoom_la-player.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-player.obj `if test -f 'player.c'; then $(CYGPATH_W) 'player.c'; else $(CYGPATH_W) '$(srcdir)/player.c'; fi`
-
-libzoom_la-player.lo: player.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-player.lo -MD -MP -MF "$(DEPDIR)/libzoom_la-player.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-player.lo `test -f 'player.c' || echo '$(srcdir)/'`player.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-player.Tpo" "$(DEPDIR)/libzoom_la-player.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-player.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='player.c' object='libzoom_la-player.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-player.Plo' tmpdepfile='$(DEPDIR)/libzoom_la-player.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-player.lo `test -f 'player.c' || echo '$(srcdir)/'`player.c
-
-libzoom_la-render.o: render.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-render.o -MD -MP -MF "$(DEPDIR)/libzoom_la-render.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-render.o `test -f 'render.c' || echo '$(srcdir)/'`render.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-render.Tpo" "$(DEPDIR)/libzoom_la-render.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-render.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='render.c' object='libzoom_la-render.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-render.Po' tmpdepfile='$(DEPDIR)/libzoom_la-render.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-render.o `test -f 'render.c' || echo '$(srcdir)/'`render.c
-
-libzoom_la-render.obj: render.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-render.obj -MD -MP -MF "$(DEPDIR)/libzoom_la-render.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-render.obj `if test -f 'render.c'; then $(CYGPATH_W) 'render.c'; else $(CYGPATH_W) '$(srcdir)/render.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-render.Tpo" "$(DEPDIR)/libzoom_la-render.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-render.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='render.c' object='libzoom_la-render.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-render.Po' tmpdepfile='$(DEPDIR)/libzoom_la-render.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-render.obj `if test -f 'render.c'; then $(CYGPATH_W) 'render.c'; else $(CYGPATH_W) '$(srcdir)/render.c'; fi`
-
-libzoom_la-render.lo: render.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-render.lo -MD -MP -MF "$(DEPDIR)/libzoom_la-render.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-render.lo `test -f 'render.c' || echo '$(srcdir)/'`render.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-render.Tpo" "$(DEPDIR)/libzoom_la-render.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-render.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='render.c' object='libzoom_la-render.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-render.Plo' tmpdepfile='$(DEPDIR)/libzoom_la-render.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-render.lo `test -f 'render.c' || echo '$(srcdir)/'`render.c
-
-libzoom_la-texture.o: texture.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-texture.o -MD -MP -MF "$(DEPDIR)/libzoom_la-texture.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-texture.o `test -f 'texture.c' || echo '$(srcdir)/'`texture.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-texture.Tpo" "$(DEPDIR)/libzoom_la-texture.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-texture.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='texture.c' object='libzoom_la-texture.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-texture.Po' tmpdepfile='$(DEPDIR)/libzoom_la-texture.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-texture.o `test -f 'texture.c' || echo '$(srcdir)/'`texture.c
-
-libzoom_la-texture.obj: texture.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-texture.obj -MD -MP -MF "$(DEPDIR)/libzoom_la-texture.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-texture.obj `if test -f 'texture.c'; then $(CYGPATH_W) 'texture.c'; else $(CYGPATH_W) '$(srcdir)/texture.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-texture.Tpo" "$(DEPDIR)/libzoom_la-texture.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-texture.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='texture.c' object='libzoom_la-texture.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-texture.Po' tmpdepfile='$(DEPDIR)/libzoom_la-texture.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-texture.obj `if test -f 'texture.c'; then $(CYGPATH_W) 'texture.c'; else $(CYGPATH_W) '$(srcdir)/texture.c'; fi`
-
-libzoom_la-texture.lo: texture.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-texture.lo -MD -MP -MF "$(DEPDIR)/libzoom_la-texture.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-texture.lo `test -f 'texture.c' || echo '$(srcdir)/'`texture.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-texture.Tpo" "$(DEPDIR)/libzoom_la-texture.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-texture.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='texture.c' object='libzoom_la-texture.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-texture.Plo' tmpdepfile='$(DEPDIR)/libzoom_la-texture.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-texture.lo `test -f 'texture.c' || echo '$(srcdir)/'`texture.c
-
-libzoom_la-light.o: light.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-light.o -MD -MP -MF "$(DEPDIR)/libzoom_la-light.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-light.o `test -f 'light.c' || echo '$(srcdir)/'`light.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-light.Tpo" "$(DEPDIR)/libzoom_la-light.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-light.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='light.c' object='libzoom_la-light.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-light.Po' tmpdepfile='$(DEPDIR)/libzoom_la-light.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-light.o `test -f 'light.c' || echo '$(srcdir)/'`light.c
-
-libzoom_la-light.obj: light.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-light.obj -MD -MP -MF "$(DEPDIR)/libzoom_la-light.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-light.obj `if test -f 'light.c'; then $(CYGPATH_W) 'light.c'; else $(CYGPATH_W) '$(srcdir)/light.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-light.Tpo" "$(DEPDIR)/libzoom_la-light.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-light.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='light.c' object='libzoom_la-light.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-light.Po' tmpdepfile='$(DEPDIR)/libzoom_la-light.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-light.obj `if test -f 'light.c'; then $(CYGPATH_W) 'light.c'; else $(CYGPATH_W) '$(srcdir)/light.c'; fi`
-
-libzoom_la-light.lo: light.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -MT libzoom_la-light.lo -MD -MP -MF "$(DEPDIR)/libzoom_la-light.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libzoom_la-light.lo `test -f 'light.c' || echo '$(srcdir)/'`light.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libzoom_la-light.Tpo" "$(DEPDIR)/libzoom_la-light.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libzoom_la-light.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='light.c' object='libzoom_la-light.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libzoom_la-light.Plo' tmpdepfile='$(DEPDIR)/libzoom_la-light.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzoom_la_CFLAGS) $(CFLAGS) -c -o libzoom_la-light.lo `test -f 'light.c' || echo '$(srcdir)/'`light.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -515,42 +357,50 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool
-uninstall-info-am:
+install-pkgconfigDATA: $(pkgconfig_DATA)
-nobase_includeHEADERS_INSTALL = $(install_sh_DATA)
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(nobase_include_HEADERS)'; for p in $$list; do \
+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="$$p"; \
+	  f=$(am__strip_dir) \
-	  echo " $(nobase_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
+	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  $(nobase_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
 	done
 
-uninstall-nobase_includeHEADERS:
+uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_include_HEADERS)'; for p in $$list; do \
+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  f="$$p"; \
+	  f=$(am__strip_dir) \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	done
+install-library_includeHEADERS: $(library_include_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(library_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_includedir)"
+	@list='$(library_include_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/$$f'"; \
+	  $(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/$$f"; \
 	done
 
-ETAGS = etags
+uninstall-library_includeHEADERS:
-ETAGSFLAGS =
+	@$(NORMAL_UNINSTALL)
-
+	@list='$(library_include_HEADERS)'; for p in $$list; do \
-CTAGS = ctags
+	  f=$(am__strip_dir) \
-CTAGSFLAGS =
+	  echo " rm -f '$(DESTDIR)$(library_includedir)/$$f'"; \
-
+	  rm -f "$(DESTDIR)$(library_includedir)/$$f"; \
-tags: TAGS
+	done
 
 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)
@@ -560,23 +410,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
@@ -588,40 +438,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)/zoom
+	@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; \
@@ -635,22 +470,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
@@ -670,19 +538,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 \
@@ -703,10 +572,11 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(library_includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -726,7 +596,7 @@ mostlyclean-generic:
 clean-generic:
 
 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"
@@ -740,25 +610,35 @@ 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-libtool 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_includeHEADERS
+install-data-am: install-library_includeHEADERS install-pkgconfigDATA
+
+install-dvi: install-dvi-am
 
 install-exec-am: install-libLTLIBRARIES
 
+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
@@ -781,23 +661,29 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+uninstall-am: uninstall-libLTLIBRARIES \
-	uninstall-nobase_includeHEADERS
+	uninstall-library_includeHEADERS uninstall-pkgconfigDATA
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+.MAKE: install-am install-strip
-	clean-libLTLIBRARIES clean-libtool ctags dist dist-all \
+
-	dist-gzip distcheck distclean distclean-compile \
+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
+	clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
+	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
+	dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am info info-am install install-am install-data \
+	dvi-am html html-am info info-am install install-am \
-	install-data-am install-exec install-exec-am install-info \
+	install-data install-data-am install-dvi install-dvi-am \
-	install-info-am install-libLTLIBRARIES install-man \
+	install-exec install-exec-am install-html install-html-am \
-	install-nobase_includeHEADERS install-strip installcheck \
+	install-info install-info-am install-libLTLIBRARIES \
-	installcheck-am installdirs maintainer-clean \
+	install-library_includeHEADERS install-man install-pdf \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	install-strip installcheck installcheck-am installdirs \
-	tags uninstall uninstall-am uninstall-info-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
-	uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-libLTLIBRARIES uninstall-library_includeHEADERS \
+	uninstall-pkgconfigDATA
 
 # 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.

config.h.in

@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Use the Apple OpenGL framework. */
 #undef HAVE_APPLE_OPENGL_FRAMEWORK
@@ -9,9 +9,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `neofx' library (-lneofx). */
-#undef HAVE_LIBNEOFX
-
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
 #undef HAVE_MALLOC
@@ -35,9 +32,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 

configure.ac

@@ -4,7 +4,7 @@
 AC_PREREQ(2.59)
 AC_INIT(libzoom, 0.1, matthias@gamezock.de)
 AC_CONFIG_SRCDIR([player.c])
-AC_CONFIG_HEADER([config.h])
+AM_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE(libzoom, 0.1)
 AM_MAINTAINER_MODE
@@ -25,8 +25,12 @@ if test x$no_gl = xyes; then
   AC_MSG_ERROR([OpenGL Utility Library not found])
 fi
 
-AC_CHECK_LIB(neofx, MatrixMul, , AC_MSG_ERROR([NeoFX Library not found]))
+PKG_CHECK_MODULES(libneofx, libneofx-0.1, , AC_MSG_ERROR(Test for libneofx failed.))
-PKG_CHECK_MODULES(LIBPNG, libpng, , AC_MSG_ERROR(Test for libpng failed.))
+PKG_CHECK_MODULES(libpng, libpng, , AC_MSG_ERROR(Test for libpng failed.))
+PKG_CHECK_MODULES(libxml2, libxml-2.0, , AC_MSG_ERROR(Test for libxml2 failed.))
+
+CFLAGS="$GL_CFLAGS $GLU_CFLAGS $libneofx_CFLAGS $libpng_CFLAGS $libxml2_CFLAGS $CFLAGS"
+LIBS="$GL_LIBS $GLU_LIBS $libneofx_LIBS $libpng_LIBS $libxml2_LIBS $LIBS"
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -38,7 +42,7 @@ AC_HEADER_TIME
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([strcasecmp], , AC_MSG_ERROR([required function strcasecmp not found]))
+#AC_CHECK_FUNCS([strcasecmp], , AC_MSG_ERROR([required function strcasecmp not found]))
 
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+AC_OUTPUT([libzoom-0.1.pc])

init.c

@@ -5,18 +5,21 @@
 #include <zoom/texture.h>
 #include <zoom/level.h>
 #include <zoom/light.h>
+#include <zoom/player.h>
 
-LEVEL level;
+LEVEL *level;
 GLuint sphere;
 GLuint meditex_blue;
 GLuint lightmap;
 
 
 extern TEXLIST *texlist;
+extern PLAYER player;
+
 
 int InitGame() {
-	LIGHT light = {LIGHT_POINT, {15.0, 15.0, 15.0}, {0.0, 0.0, 0.0}};
+	LIGHT light = {LIGHT_POINT, {{15.0, 15.0, 15.0}}, {{0.0, 0.0, 0.0}}};
-	COLOR ambient = {0.1, 0.1, 0.1};
+	COLOR ambient = {{0.1, 0.1, 0.1}};
 	
 	
 	glViewport(0, 0, 640, 480);
@@ -57,8 +60,10 @@ int InitGame() {
 	gluQuadricDrawStyle(quadric, GLU_FILL);
 	gluQuadricTexture(quadric, GL_TRUE);
 	
-	LoadLevel("level2.lvl", &level);
+	level = LoadLevel("level.lvl");
-	
+  
+  player.pos = level->info->start;
+  
 	sphere = glGenLists(1);
 	glNewList(sphere, GL_COMPILE);
 	glRotatef(90, 1.0, 0.0, 0.0);
@@ -71,6 +76,6 @@ int InitGame() {
 }
 
 void UninitGame() {
-	FreeLevel(&level);
+	FreeLevel(level);
 	free(texlist);
 }

level.c

@@ -7,6 +7,9 @@
 #include <zoom/texture.h>
 #include <zoom/level.h>
 #include <zoom/light.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/valid.h>
 
 
 extern GLuint sphere;
@@ -15,66 +18,353 @@ extern float objrot;
 extern LIGHT *lights;
 extern int nLights;
 
-int LoadLevel(char *filename, LEVEL *level) {
+
-	FILE *file;
+static int SortTextures(const void *t1, const void *t2) {
-	LEVELHEADER levelheader;
+  return strcmp(((TEXTURE*)t1)->name, ((TEXTURE*)t2)->name);
-	ROOMHEADER roomheader;
+}
-	int i, j;
+
-	unsigned char c;
+static int SortRooms(const void *r1, const void *r2) {
-	unsigned char buffer[260];
+  return strcmp(((ROOM*)r1)->id, ((ROOM*)r2)->id);
-	
+}
-	strcpy(buffer, "levels/");
+
-	strcat(buffer, filename);
+
-	file = fopen(buffer, "rb");
+static void LoadTriangles(xmlNodePtr node, LEVEL *level, WALL* walls, int nWalls) {
-	if(!file) return 0;
+  int i = 0, j;
-	
+  xmlNodePtr node2;
-	fread(&levelheader, sizeof(LEVELHEADER), 1, file);
+  xmlChar *data;
-	if(levelheader.l != 'L' || levelheader.f != 'F') {
+  TEXTURE tex, *texp;
-		fclose(file);
+  VECTOR v;
-		return 0;
+  
-	}
+  
-	
+  for(; node != NULL; node = node->next) {
-	level->nRooms = levelheader.nRooms;
+    if(node->type != XML_ELEMENT_NODE || xmlStrcmp(node->name, (xmlChar*)"triangle")) continue;
-	level->rooms = malloc(levelheader.nRooms * sizeof(ROOM));
+    
-	
+    walls[i].visible = 1;
-	for(i = 0; i < levelheader.nRooms; i++) {
+    data = xmlGetProp(node, (xmlChar*)"visible");
-		fread(&roomheader, sizeof(ROOMHEADER), 1, file);
+    if(data) {
-		
+      if(!xmlStrcmp(data, (xmlChar*)"false")) walls[i].visible = 0;
-		level->rooms[i].nWalls = roomheader.nWalls;
+      xmlFree(data);
-		level->rooms[i].walls = malloc(roomheader.nWalls * sizeof(WALL));
+    }
-		fread(level->rooms[i].walls, sizeof(WALL), roomheader.nWalls, file);
+    
-		
+    data = xmlGetProp(node, (xmlChar*)"texture");
-		level->rooms[i].nThings = roomheader.nThings;
+    if(data) {
-		level->rooms[i].things = malloc(roomheader.nThings * sizeof(THING));
+      tex.name = (char*)data;
-		fread(level->rooms[i].things, sizeof(THING), roomheader.nThings, file);
+      texp = bsearch(&tex, level->textures, level->nTextures, sizeof(TEXTURE), SortTextures);
-		
+      
-		level->rooms[i].nGates = roomheader.nGates;
+      if(texp) walls[i].texture = texp->id;
-		level->rooms[i].gates = malloc(roomheader.nGates * sizeof(GATE));
+      
-		fread(level->rooms[i].gates, sizeof(GATE), roomheader.nGates, file);
+      xmlFree(data);
-		
+    }
-		level->rooms[i].gateinfo = malloc(roomheader.nGates * sizeof(GATEINFO));
+    
-		for(j = 0; j < level->rooms[i].nGates; j++) level->rooms[i].gateinfo[j].state = STATE_CLOSED;
+    j = -1;
-	}
+    for(node2 = node->children; node2 != NULL; node2 = node2->next) {
-	
+      if(node2->type != XML_ELEMENT_NODE) continue;
-	level->nTextures = levelheader.nTextures;
+      
-	level->textures = malloc(levelheader.nTextures * sizeof(GLuint));
+      if(!xmlStrcmp(node2->name, (xmlChar*)"vertex")) {
-	
+        if(++j > 2) break;
-	for(i = 0; i < levelheader.nTextures; i++) {
+        
-		fread(&c, 1, 1, file);
+        data = xmlGetProp(node2, (xmlChar*)"x");
-		fread(buffer, c, 1, file);
+        if(data) {
-		buffer[c] = 0;
+          walls[i].vertices[j].x = atof((char*)data);
-		level->textures[i] = LoadTexture(buffer);
+          xmlFree(data);
-	}
+        }
-	
+        
-	fclose(file);
+        data = xmlGetProp(node2, (xmlChar*)"y");
-	return 1;
+        if(data) {
+          walls[i].vertices[j].y = atof((char*)data);
+          xmlFree(data);
+        }
+        
+        data = xmlGetProp(node2, (xmlChar*)"z");
+        if(data) {
+          walls[i].vertices[j].z = atof((char*)data);
+          xmlFree(data);
+        }
+      }
+      else if(!xmlStrcmp(node2->name, (xmlChar*)"normal")) {
+        if(j < 0) continue;
+        
+        data = xmlGetProp(node2, (xmlChar*)"x");
+        if(data) {
+          walls[i].normals[j].x = atof((char*)data);
+          xmlFree(data);
+        }
+        
+        data = xmlGetProp(node2, (xmlChar*)"y");
+        if(data) {
+          walls[i].normals[j].y = atof((char*)data);
+          xmlFree(data);
+        }
+        
+        data = xmlGetProp(node2, (xmlChar*)"z");
+        if(data) {
+          walls[i].normals[j].z = atof((char*)data);
+          xmlFree(data);
+        }
+      }
+      else if(!xmlStrcmp(node2->name, (xmlChar*)"texcoords")) {
+        if(j < 0) continue;
+        
+        data = xmlGetProp(node2, (xmlChar*)"s");
+        if(data) {
+          walls[i].texcoords[j].s = atof((char*)data);
+          xmlFree(data);
+        }
+        
+        data = xmlGetProp(node2, (xmlChar*)"t");
+        if(data) {
+          walls[i].texcoords[j].t = atof((char*)data);
+          xmlFree(data);
+        }
+      }
+    }
+    
+    v = VectorCross(
+      VectorSub(walls[i].vertices[1], walls[i].vertices[0]),
+      VectorSub(walls[i].vertices[2], walls[i].vertices[0])
+    );
+    if(VectorLengthSq(v) > 0.0) {
+      walls[i].normal = VectorNormalize(v);
+      
+      for(j = 0; j < 3; j++) {
+        if(VectorLengthSq(walls[i].normals[j]) == 0.0)
+          walls[i].normals[j] = walls[i].normal;
+      }
+    }
+    
+    i++;
+  }
+}
+
+
+LEVEL *LoadLevel(char *filename) {
+  LEVEL *level;
+  xmlDocPtr doc;
+  xmlDtdPtr dtd;
+  xmlValidCtxtPtr validCtxt;
+  xmlNodePtr root, node, node2, rooms = NULL, gates = NULL;
+  xmlChar *data;
+  char *name;
+  int i;
+  ROOM room, *roomp;
+  
+  
+  name = malloc(strlen(filename)+8);
+  strcpy(name, "levels/");
+  strcat(name, filename);
+  
+  doc = xmlParseFile(name);
+  
+  free(name);
+  
+  if(!doc)
+    return NULL;
+  
+  dtd = xmlParseDTD((xmlChar*)"-//libzoom//DTD level 0.1//EN", (xmlChar*)"levels/level.dtd");
+  
+  if(!dtd) {
+    xmlFreeDoc(doc);
+    xmlCleanupParser();
+    return NULL;
+  }
+  
+  validCtxt = xmlNewValidCtxt();
+  
+  if(!validCtxt) {
+    xmlFreeDtd(dtd);
+    xmlFreeDoc(doc);
+    xmlCleanupParser();
+    return NULL;
+  }
+  
+  if(!xmlValidateDtd(validCtxt, doc, dtd)) {
+    xmlFreeValidCtxt(validCtxt);
+    xmlFreeDtd(dtd);
+    xmlFreeDoc(doc);
+    xmlCleanupParser();
+    return NULL;
+  }
+  
+  xmlFreeValidCtxt(validCtxt);
+  xmlFreeDtd(dtd);
+  
+  root = xmlDocGetRootElement(doc);
+  if(!root || xmlStrcmp(root->name, (xmlChar*)"level")) {
+    xmlFreeDoc(doc);
+    xmlCleanupParser();
+    return NULL;
+    
+    
+  }
+  
+  level = calloc(1, sizeof(LEVEL));
+  
+  for(node = root->children; node != NULL; node = node->next) {
+    if(node->type != XML_ELEMENT_NODE) continue;
+    
+    if(!xmlStrcmp(node->name, (xmlChar*)"info")) {
+      level->info = calloc(1, sizeof(LEVELINFO));
+      
+      for(node2 = node->children; node2 != NULL; node2 = node2->next) {
+        if(node2->type != XML_ELEMENT_NODE) continue;
+        
+        if(!xmlStrcmp(node2->name, (xmlChar*)"name")) {
+          if(level->info->name != NULL) continue;
+          
+          data = xmlNodeGetContent(node2);
+          level->info->name = strdup((char*)data);
+          xmlFree(data);
+        }
+        else if(!xmlStrcmp(node2->name, (xmlChar*)"desc")) {
+          if(level->info->desc != NULL) continue;
+          
+          data = xmlNodeGetContent(node2);
+          level->info->desc = strdup((char*)data);
+          xmlFree(data);
+        }
+        else if(!xmlStrcmp(node2->name, (xmlChar*)"start")) {
+          data = xmlGetProp(node2, (xmlChar*)"x");
+          if(data) level->info->start.x = atof((char*)data);
+          xmlFree(data);
+          
+          data = xmlGetProp(node2, (xmlChar*)"y");
+          if(data) level->info->start.y = atof((char*)data);
+          xmlFree(data);
+          
+          data = xmlGetProp(node2, (xmlChar*)"z");
+          if(data) level->info->start.z = atof((char*)data);
+          xmlFree(data);
+        }
+      }
+    }
+    else if(!xmlStrcmp(node->name, (xmlChar*)"rooms")) {
+      if(rooms != NULL) continue;
+      
+      rooms = node;
+      
+      for(node2 = node->children; node2 != NULL; node2 = node2->next) {
+        if(node2->type == XML_ELEMENT_NODE && !xmlStrcmp(node2->name, (xmlChar*)"room")) level->nRooms++;
+      }
+    }
+    else if(!xmlStrcmp(node->name, (xmlChar*)"gates")) {
+      if(gates != NULL) continue;
+      
+      gates = node;
+      
+      node2 = node->children;
+      
+      for(node2 = node->children; node2 != NULL; node2 = node2->next) {
+        if(node2->type == XML_ELEMENT_NODE && !xmlStrcmp(node2->name, (xmlChar*)"gate")) level->nGates++;
+      }
+    }
+    else if(!xmlStrcmp(node->name, (xmlChar*)"textures")) {
+      if(level->textures != NULL) continue;
+      
+      for(node2 = node->children; node2 != NULL; node2 = node2->next) {
+        if(node2->type == XML_ELEMENT_NODE && !xmlStrcmp(node2->name, (xmlChar*)"texture")) level->nTextures++;
+      }
+      
+      level->textures = calloc(level->nTextures, sizeof(TEXTURE));
+      
+      i = 0;
+      for(node2 = node->children; node2 != NULL; node2 = node2->next) {
+        if(node2->type != XML_ELEMENT_NODE || xmlStrcmp(node2->name, (xmlChar*)"texture")) continue;
+        
+        data = xmlGetProp(node2, (xmlChar*)"name");
+        if(data) {
+          level->textures[i].id = LoadTexture((char*)data);
+          
+          xmlFree(data);
+        }
+        
+        data = xmlGetProp(node2, (xmlChar*)"id");
+        if(data) {
+          level->textures[i].name = strdup((char*)data);
+          
+          xmlFree(data);
+        }
+        
+        i++;
+      }
+      
+      qsort(level->textures, level->nTextures, sizeof(TEXTURE), SortTextures);
+    }
+  }
+  
+  level->rooms = calloc(level->nRooms, sizeof(ROOM));
+  
+  i = 0;
+  for(node = rooms->children; node != NULL; node = node->next) {
+    if(node->type != XML_ELEMENT_NODE || xmlStrcmp(node->name, (xmlChar*)"room")) continue;
+    
+    data = xmlGetProp(node, (xmlChar*)"id");
+    if(data) {
+      level->rooms[i].id = strdup((char*)data);
+      
+      xmlFree(data);
+    }
+    
+    for(node2 = node->children; node2 != NULL; node2 = node2->next) {
+      if(node2->type == XML_ELEMENT_NODE && !xmlStrcmp(node2->name, (xmlChar*)"triangle")) level->rooms[i].nWalls++;
+    }
+    
+    level->rooms[i].walls = calloc(level->rooms[i].nWalls, sizeof(WALL));
+    
+    LoadTriangles(node->children, level, level->rooms[i].walls, level->rooms[i].nWalls);
+    
+    i++;
+  }
+  
+  qsort(level->rooms, level->nRooms, sizeof(ROOM), SortRooms);
+  
+  level->gates = calloc(level->nGates, sizeof(GATE));
+  
+  i = 0;
+  for(node = gates->children; node != NULL; node = node->next) {
+    if(node->type != XML_ELEMENT_NODE || xmlStrcmp(node->name, (xmlChar*)"gate")) continue;
+    
+    data = xmlGetProp(node, (xmlChar*)"room1");
+    if(data) {
+      room.id = (char*)data;
+      roomp = bsearch(&room, level->rooms, level->nRooms, sizeof(ROOM), SortRooms);
+      
+      if(roomp) level->gates[i].room1 = roomp;
+      
+      xmlFree(data);
+    }
+    
+    data = xmlGetProp(node, (xmlChar*)"room2");
+    if(data) {
+      room.id = (char*)data;
+      roomp = bsearch(&room, level->rooms, level->nRooms, sizeof(ROOM), SortRooms);
+      
+      if(roomp) level->gates[i].room2 = roomp;
+      
+      xmlFree(data);
+    }
+    
+    for(node2 = node->children; node2 != NULL; node2 = node2->next) {
+      if(node2->type == XML_ELEMENT_NODE && !xmlStrcmp(node2->name, (xmlChar*)"triangle")) level->gates[i].nWalls++;
+    }
+    
+    level->gates[i].walls = calloc(level->gates[i].nWalls, sizeof(WALL));
+    
+    LoadTriangles(node->children, level, level->gates[i].walls, level->gates[i].nWalls);
+    
+    i++;
+  }
+  
+  xmlFreeDoc(doc);
+  xmlCleanupParser();
+  
+  return level;
 }
 
 POLYGON_LIST *DrawRoom(LEVEL *level, int nr) {
 	ROOM room = level->rooms[nr];
 	POLYGON_LIST *p;
 	int i;
-	
+  
 	p = malloc(sizeof(POLYGON_LIST)+sizeof(POLYGON)*room.nWalls);
 	p->nPolygons = room.nWalls;
 	
@@ -84,8 +374,11 @@ POLYGON_LIST *DrawRoom(LEVEL *level, int nr) {
 		p->polygons[i].vertices[2] = room.walls[i].vertices[2];
 		
 		p->polygons[i].normal = room.walls[i].normal;
+    p->polygons[i].normals[0] = room.walls[i].normals[0];
+    p->polygons[i].normals[1] = room.walls[i].normals[1];
+    p->polygons[i].normals[2] = room.walls[i].normals[2];
 		
-		p->polygons[i].texture = level->textures[room.walls[i].texture];
+		p->polygons[i].texture = room.walls[i].texture;
 		
 		p->polygons[i].texcoords[0] = room.walls[i].texcoords[0];
 		p->polygons[i].texcoords[1] = room.walls[i].texcoords[1];
@@ -334,15 +627,52 @@ POLYGON_LIST *DrawRoom(LEVEL *level, int nr) {
 void FreeLevel(LEVEL *level) {
 	int i;
 	
-	if(level->nRooms) {
+  if(level) {
-		for(i = 0; i < level->nRooms; i++) {
+    if(level->info) {
-			if(level->rooms[i].nWalls) free(level->rooms[i].walls);
+      if(level->info->name)
-			if(level->rooms[i].nThings) free(level->rooms[i].things);
+        free(level->info->name);
-			if(level->rooms[i].nGates) {
+      
-				free(level->rooms[i].gates);
+      if(level->info->desc)
-				free(level->rooms[i].gateinfo);
+        free(level->info->desc);
-			}
+      
-		}
+      free(level->info);
-		free(level->rooms);
+    }
-	}
+    
+  	if(level->rooms) {
+  		for(i = 0; i < level->nRooms; i++) {
+  			if(level->rooms[i].walls)
+          free(level->rooms[i].walls);
+  			/*if(level->rooms[i].nThings) free(level->rooms[i].things);
+  			if(level->rooms[i].nGates) {
+  				free(level->rooms[i].gates);
+  				free(level->rooms[i].gateinfo);
+  			}*/
+        
+        if(level->rooms[i].id)
+          free(level->rooms[i].id);
+  		}
+      
+  		free(level->rooms);
+  	}
+    
+    if(level->gates) {
+      for(i = 0; i < level->nGates; i++) {
+        if(level->gates[i].walls)
+          free(level->gates[i].walls);
+      }
+      
+      free(level->gates);
+    }
+    
+    if(level->textures) {
+      for(i = 0; i < level->nTextures; i++) {
+        if(level->textures[i].name)
+          free(level->textures[i].name);
+      }
+      
+      free(level->textures);
+    }
+    
+    free(level);
+  }
 }

libzoom-0.1.pc.in

@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libzoom
+Description: Zoom library
+Requires: libneofx-0.1
+Version: @VERSION@
+Libs: -L${libdir} -lzoom
+Cflags: -I${includedir}/libzoom-0.1

player.c

@@ -10,7 +10,7 @@ int input = 0;
 int falling = 0;
 
 PLAYER player = {
-	{0.0, 0.0, 0.0},
+	{{0.0, 0.0, 0.0}},
 	0.0, 0.0, 1.0,
 	100, 100, 0
 };
@@ -20,7 +20,7 @@ float rotxspeed = 0, rotyspeed = 0;
 
 float objrot = 0;
 
-extern LEVEL level;
+extern LEVEL *level;
 extern int nLights;
 extern LIGHT *lights;
 
@@ -34,16 +34,16 @@ void MouseInput(int x, int y) {
 
 void DoInput(int delta) {
 	int i, wasfalling = falling;
-	int g;
+	//int g;
 	VERTEX pos;
 	int room = player.room;
-	VECTOR move = {0.0, 0.0, 0.0};
+	VECTOR move = {{0.0, 0.0, 0.0}};
-	VECTOR v = {0.0, -1.0, 0.0};
+	VECTOR v = {{0.0, -1.0, 0.0}};
 	float s, c;
 	float f = 0.0;
-	VERTEX p1, p2;
+	//VERTEX p1, p2;
-	VECTOR v1, v2;
+	//VECTOR v1, v2;
-	MATRIX transform;
+	//MATRIX transform;
 	
 	objrot += 0.01*delta;
 	if(objrot > 360.0) objrot -= 360.0;
@@ -77,7 +77,7 @@ void DoInput(int delta) {
 	s = player.rotysin;
 	c = player.rotycos;
 	
-	if(!falling) {
+  if(!falling) {
 		if((input & INPUT_UP) && !(input & INPUT_DOWN)) {
 			if((input & INPUT_RIGHT) && !(input & INPUT_LEFT)) {
 				move.x = (s+c)*M_SQRT1_2;
@@ -114,37 +114,37 @@ void DoInput(int delta) {
 			move.x = -c;
 			move.z = -s;
 		}
-		if(input & INPUT_OPEN) {
+		/*if(input & INPUT_OPEN) {
-			for(i = 0; i < level.rooms[room].nGates; i++) {
+			for(i = 0; i < level->rooms[room].nGates; i++) {
-				if(level.rooms[room].gateinfo[i].state != STATE_CLOSED) continue;
+				if(level->rooms[room].gateinfo[i].state != STATE_CLOSED) continue;
-				if(CollisionSphereTriangle(player.pos, 1.0, level.rooms[room].gates[i].walls[0].triangle) ||
+				if(CollisionSphereTriangle(player.pos, 1.0, level->rooms[room].gates[i].walls[0].triangle) ||
-					CollisionSphereTriangle(player.pos, 1.0, level.rooms[room].gates[i].walls[1].triangle)) {
+					CollisionSphereTriangle(player.pos, 1.0, level->rooms[room].gates[i].walls[1].triangle)) {
-					level.rooms[room].gateinfo[i].state = STATE_OPENING;
+					level->rooms[room].gateinfo[i].state = STATE_OPENING;
-					level.rooms[room].gateinfo[i].timer = 1000;
+					level->rooms[room].gateinfo[i].timer = 1000;
 				}
 			}
-		}
+		}*/
 	}
 	
 	pos = VectorAdd(player.pos, VectorMul(move, delta/150.0));
 	
 	if(falling) pos.y -= delta/100.0;
 	
-	for(i = 0; i < level.rooms[room].nGates; i++) {
+	/*for(i = 0; i < level->rooms[room].nGates; i++) {
-		if(CollisionSphereTriangle(pos, 0.3, level.rooms[room].gates[i].walls[0].triangle) ||
+		if(CollisionSphereTriangle(pos, 0.3, level->rooms[room].gates[i].walls[0].triangle) ||
-			CollisionSphereTriangle(pos, 0.3, level.rooms[room].gates[i].walls[1].triangle)) {
+			CollisionSphereTriangle(pos, 0.3, level->rooms[room].gates[i].walls[1].triangle)) {
-				if(level.rooms[room].gateinfo[i].state == STATE_OPENED) {
+				if(level->rooms[room].gateinfo[i].state == STATE_OPENED) {
-					if(CollisionPointTriangle(pos, level.rooms[room].gates[i].walls[0].triangle) ||
+					if(CollisionPointTriangle(pos, level->rooms[room].gates[i].walls[0].triangle) ||
-						CollisionPointTriangle(pos, level.rooms[room].gates[i].walls[1].triangle)) {
+						CollisionPointTriangle(pos, level->rooms[room].gates[i].walls[1].triangle)) {
-							p1 = level.rooms[room].gates[i].point;
+							p1 = level->rooms[room].gates[i].point;
-							v1 = level.rooms[room].gates[i].walls[0].normal;
+							v1 = level->rooms[room].gates[i].walls[0].normal;
-							level.rooms[room].gateinfo[i].state = STATE_CLOSED;
+							level->rooms[room].gateinfo[i].state = STATE_CLOSED;
-							g = level.rooms[room].gates[i].gate;
+							g = level->rooms[room].gates[i].gate;
-							room = level.rooms[room].gates[i].room;
+							room = level->rooms[room].gates[i].room;
-							p2 = level.rooms[room].gates[g].point;
+							p2 = level->rooms[room].gates[g].point;
-							v2 = VectorNeg(level.rooms[room].gates[g].walls[0].normal);
+							v2 = VectorNeg(level->rooms[room].gates[g].walls[0].normal);
-							level.rooms[room].gateinfo[g].state = STATE_OPENED;
+							level->rooms[room].gateinfo[g].state = STATE_OPENED;
-							level.rooms[room].gateinfo[g].timer = 5000;
+							level->rooms[room].gateinfo[g].timer = 5000;
 							transform = VectorMatrix(p2, v2, p1, v1);
 							pos = VectorMatrixMul(pos, transform);
 							v1.x = p1.x + c;
@@ -155,66 +155,66 @@ void DoInput(int delta) {
 							move = VectorSub(VectorMatrixMul(VectorAdd(move, p1), transform), p2);
 							break;
 					}
-					level.rooms[room].gateinfo[i].timer = 5000;
+					level->rooms[room].gateinfo[i].timer = 5000;
 				}
 				else pos = player.pos;
 		}
-	}
+	}*/
 	falling = 1;
-	for(i = 0; i < level.rooms[room].nWalls; i++) {
+	for(i = 0; i < level->rooms[room].nWalls; i++) {
-		if(level.rooms[room].walls[i].type == TRIANGLE_WALL &&
+		if(/*level->rooms[room].walls[i].type == TRIANGLE_WALL &&*/
-			CollisionMovingSphereTriangle(VectorSub(pos, VectorMul(move, delta/150.0)), 0.3, move, delta/150.0, level.rooms[room].walls[i].triangle)) {
+			CollisionMovingSphereTriangle(VectorSub(pos, VectorMul(move, delta/150.0)), 0.3, move, delta/150.0, level->rooms[room].walls[i].triangle)) {
 				pos = player.pos;
-				if(player.room != room) {
+				/*if(player.room != room) {
-					level.rooms[room].gateinfo[g].state = STATE_CLOSED;
+					level->rooms[room].gateinfo[g].state = STATE_CLOSED;
-					g = level.rooms[room].gates[g].gate;
+					g = level->rooms[room].gates[g].gate;
 					room = player.room;
-					level.rooms[room].gateinfo[g].state = STATE_OPENED;
+					level->rooms[room].gateinfo[g].state = STATE_OPENED;
-				}
+				}*/
 				s = player.rotysin;
 				c = player.rotycos;
 				falling = 0;
 				break;
 		}
-		else if(level.rooms[room].walls[i].type == TRIANGLE_FLOOR) {
+		//else if(level->rooms[room].walls[i].type == TRIANGLE_FLOOR) {
 			pos.y -= 1.81;
-			if(CollisionPointTriangle(pos, level.rooms[room].walls[i].triangle)) {
+			if(CollisionPointTriangle(pos, level->rooms[room].walls[i].triangle)) {
 				falling = 0;
 				pos.y += 1.81;
-				if(wasfalling && CollisionRayTriangle(pos, v, level.rooms[room].walls[i].triangle, &f)) pos.y -= f - 1.8;
+				if(wasfalling && CollisionRayTriangle(pos, v, level->rooms[room].walls[i].triangle, &f)) pos.y -= f - 1.8;
 			}
 			else pos.y += 1.81;
-		}
+		//}
 	}
 	player.pos = pos;
 	player.room = room;
 	player.rotysin = s;
 	player.rotycos = c;
 	
-	for(i = 0; i < level.rooms[player.room].nThings; i++) {
+	/*for(i = 0; i < level->rooms[player.room].nThings; i++) {
-		pos = VectorSub(level.rooms[player.room].things[i].pos, player.pos);
+		pos = VectorSub(level->rooms[player.room].things[i].pos, player.pos);
 		pos.y += 0.9;
-		switch(level.rooms[player.room].things[i].type) {
+		switch(level->rooms[player.room].things[i].type) {
 			case THING_MEDIPAK100:
-				if((pos.x*pos.x + (pos.y*pos.y)/3 + pos.z*pos.z) < 0.36) level.rooms[player.room].things[i].visible = 0;
+				if((pos.x*pos.x + (pos.y*pos.y)/3 + pos.z*pos.z) < 0.36) level->rooms[player.room].things[i].visible = 0;
 		}
 	}
 	
-	for(i = 0; i < level.rooms[player.room].nGates; i++) {
+	for(i = 0; i < level->rooms[player.room].nGates; i++) {
-		if(level.rooms[player.room].gateinfo[i].state == STATE_CLOSED) continue;
+		if(level->rooms[player.room].gateinfo[i].state == STATE_CLOSED) continue;
-		if((level.rooms[player.room].gateinfo[i].timer - delta) < 0) {
+		if((level->rooms[player.room].gateinfo[i].timer - delta) < 0) {
-			if(level.rooms[player.room].gateinfo[i].state == STATE_OPENING) {
+			if(level->rooms[player.room].gateinfo[i].state == STATE_OPENING) {
-				level.rooms[player.room].gateinfo[i].state = STATE_OPENED;
+				level->rooms[player.room].gateinfo[i].state = STATE_OPENED;
-				level.rooms[player.room].gateinfo[i].timer = 5000;
+				level->rooms[player.room].gateinfo[i].timer = 5000;
 			}
-			else if(level.rooms[player.room].gateinfo[i].state == STATE_OPENED) {
+			else if(level->rooms[player.room].gateinfo[i].state == STATE_OPENED) {
-				level.rooms[player.room].gateinfo[i].state = STATE_CLOSING;
+				level->rooms[player.room].gateinfo[i].state = STATE_CLOSING;
-				level.rooms[player.room].gateinfo[i].timer = 1000;
+				level->rooms[player.room].gateinfo[i].timer = 1000;
 			}
-			else level.rooms[player.room].gateinfo[i].state = STATE_CLOSED;
+			else level->rooms[player.room].gateinfo[i].state = STATE_CLOSED;
 		}
-		else level.rooms[player.room].gateinfo[i].timer -= delta;
+		else level->rooms[player.room].gateinfo[i].timer -= delta;
-	}
+	}*/
 	
 	static int lightpos = 0;
 	

render.c

@@ -10,7 +10,7 @@
 
 
 extern PLAYER player;
-extern LEVEL level;
+extern LEVEL *level;
 extern GLuint sphere;
 extern int nLights;
 extern LIGHT *lights;
@@ -23,13 +23,13 @@ static int SortByTex(const void *p1, const void *p2) {
 }
 
 void Render() {
-	GLfloat std_emission[] = {0.0, 0.0, 0.0, 1.0};
+	//GLfloat std_emission[] ={{0.0, 0.0, 0.0, 1.0};
-	MATRIX rotate = {
+	MATRIX rotate = {.f = {
 		player.rotycos, 0.0, -player.rotysin, 0.0,
 		0.0, 1.0, 0.0, 0.0,
 		player.rotysin, 0.0, player.rotycos, 0.0,
 		0.0, 0.0, 0.0, 1.0
-	};
+	}};
 	POLYGON_LIST *room;
 	int i, j, k;
 	float d;
@@ -47,7 +47,7 @@ void Render() {
 	
 	glTranslatef(-player.pos.x, -player.pos.y, -player.pos.z);
 	
-	room = DrawRoom(&level, player.room);
+	room = DrawRoom(level, player.room);
 	qsort(room->polygons, room->nPolygons, sizeof(POLYGON), SortByTex);
 	
 	glDepthMask(GL_TRUE);
@@ -96,10 +96,15 @@ void Render() {
 	
 	glBindTexture(GL_TEXTURE_2D, lightmap);
 	glActiveTexture(GL_TEXTURE1);
-	glEnable(GL_TEXTURE_2D);
 	
 	for(i = 0; i < nLights; i++) {
-		glBindTexture(GL_TEXTURE_2D, room->polygons[0].texture);
+	  if(room->polygons[0].texture) {
+	    glEnable(GL_TEXTURE_2D);
+	    glBindTexture(GL_TEXTURE_2D, room->polygons[0].texture);
+	  }
+		else
+		  glDisable(GL_TEXTURE_2D);
+		
 		last_tex = room->polygons[0].texture;
 		
 		glBegin(GL_TRIANGLES);
@@ -118,14 +123,14 @@ void Render() {
 				c = VectorMul(lights[i].diffuse, 1.0/(d*d));
 				glColor3fv((GLfloat*)&c);
 				
-				p = VectorAdd(lights[i].pos, VectorMul(room->polygons[j].normal, d));
-				
 				v1 = VectorNormalize(VectorSub(room->polygons[j].vertices[0], room->polygons[j].vertices[1]));
-				v2 = VectorCross(v1, room->polygons[j].normal);
 				
 				for(k = 0; k < 3; k++) {
+          p = VectorAdd(lights[i].pos, VectorMul(room->polygons[j].normals[k], d));
 					v = VectorSub(room->polygons[j].vertices[k], p);
 					
+          v2 = VectorCross(v1, room->polygons[j].normals[k]);
+          
 					glMultiTexCoord2f(0, VectorDot(v, v1)*0.04 / d + 0.5, VectorDot(v, v2)*0.04 / d + 0.5);
 					glMultiTexCoord2fv(1, (GLfloat*)&room->polygons[j].texcoords[k]);
 					glVertex3fv((GLfloat*)&room->polygons[j].vertices[k]);

zoom/level.h

@@ -5,45 +5,57 @@
 #include <zoom/types.h>
 #include <zoom/render.h>
 
-#pragma pack(push, 2)
+/*typedef struct _GATEINFO {
-typedef struct _LEVELHEADER {
-	char l, f;
-	int nRooms;
-	int nTextures;
-} LEVELHEADER;
-
-typedef struct _ROOMHEADER {
-	int nWalls;
-	int nThings;
-	int nGates;
-} ROOMHEADER;
-
-typedef struct _GATEINFO {
 	unsigned short state;
 	unsigned short timer;
-} GATEINFO;
+} GATEINFO;*/
 
 typedef struct _ROOM {
-	int nWalls;
+  char *id;
-	int nThings;
+  int nWalls;
-	int nGates;
+  //int nThings;
-	WALL *walls;
+  //int nGates;
-	THING *things;
+  WALL *walls;
-	GATE *gates;
+  //THING *things;
-	GATEINFO *gateinfo;
+  //GATE *gates;
+  //GATEINFO *gateinfo;
 } ROOM;
 
+typedef struct _GATE {
+  //unsigned char type;
+  //unsigned char open;
+  int nWalls;
+  WALL *walls;
+  //VERTEX point;
+  ROOM *room1, *room2;
+  int gate;
+} GATE;
+
+typedef struct _LEVELINFO {
+  char *name;
+  char *desc;
+  VERTEX start;
+} LEVELINFO;
+
+typedef struct _TEXTURE {
+  char *name;
+  GLuint id;
+} TEXTURE;
+
 typedef struct _LEVEL {
-	int nRooms;
+  LEVELINFO *info;
-	ROOM *rooms;
+  int nRooms;
-	int nTextures;
+  ROOM *rooms;
-	GLuint *textures;
+  int nGates;
+  GATE *gates;
+  int nTextures;
+  TEXTURE *textures;
 } LEVEL;
-#pragma pack(pop)
 
 typedef struct _POLYGON {
+  VECTOR normal;
 	VERTEX vertices[3];
-	VECTOR normal;
+	VECTOR normals[3];
 	
 	GLuint texture;
 	TEXCOORDS texcoords[3];
@@ -56,7 +68,7 @@ typedef struct _POLYGON_LIST {
 } POLYGON_LIST;
 
 
-int LoadLevel(char *, LEVEL *);
+LEVEL *LoadLevel(char *);
 POLYGON_LIST *DrawRoom(LEVEL *, int);
 void FreeLevel(LEVEL *);
 

zoom/types.h

@@ -23,7 +23,7 @@
 
 #pragma pack(push, 2)
 typedef struct WALL {
-	unsigned char type;
+	//unsigned char type;
 	unsigned char visible;
 	union {
 		TRIANGLE triangle;
@@ -32,6 +32,7 @@ typedef struct WALL {
 			VECTOR normal;
 		};
 	};
+  VECTOR normals[3];
 	int texture;
 	TEXCOORDS texcoords[3];
 } WALL;
@@ -41,15 +42,6 @@ typedef struct _THING {
 	unsigned char visible;
 	VERTEX pos;
 } THING;
-
-typedef struct _GATE {
-	unsigned char type;
-	unsigned char open;
-	WALL walls[2];
-	VERTEX point;
-	int room;
-	int gate;
-} GATE;
 #pragma pack(pop)
 
 #endif