--- libgender/Makefile	2004/10/04 07:04:58	1.10
+++ libgender/Makefile	2004/11/06 00:38:44	1.40
@@ -1,75 +1,44 @@
-CXX=g++ -O6
-CC=g++ -O
-CPPFLAGS=$(shell sdl-config --cflags) $(shell gts-config --cflags) 
-LDLIBS=$(shell sdl-config --libs) $(shell gts-config --libs) -lGL
+CXX=g++ -O0 -ggdb
+CC=$(CXX)
+CXXFLAGS=$(shell sdl-config --cflags) -DDEBUG
+LDLIBS=$(shell sdl-config --libs) -lSDL_image -lGL -lGLU
 
 all: test
 
-test: test.o entity.o oct.o view.o txtprt_import.o util.o
+test: test.o entity.o oct.o view.o txtprt_import.o util.o level1.o material.o shader.o shader_vars.o y.tab.o lex.yy.o
+
+y.tab.o: y.tab.c lex.yy.c
+
+lex.yy.c: doom3map_lexer.l y.tab.h
+	lex $<
+
+y.tab.h: y.tab.c
+
+y.tab.c: doom3map_parser.y
+	yacc -d $<
 
 clean:
 	rm -f test *.o
 
 depend:
-	makedepend *.C *.h
+	makedepend -Y *.C >/dev/null 2>&1
 
 # DO NOT DELETE
 
-entity.o: entity.h /usr/include/GL/gl.h /usr/include/GL/glext.h
-entity.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h util.h oct.h
-entity.o: view.h
-oct.o: /usr/include/GL/gl.h /usr/include/GL/glext.h
-oct.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h oct.h util.h
-oct.o: view.h entity.h
-se.o: /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h
-se.o: /usr/include/gnu/stubs.h
-se.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h
-se.o: /usr/include/stdio.h /usr/include/bits/types.h
-se.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h
-se.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
-se.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-se.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stdarg.h
-se.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-se.o: /usr/include/string.h /usr/include/math.h /usr/include/bits/huge_val.h
-se.o: /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
-test.o: /usr/include/stdlib.h /usr/include/features.h
-test.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-test.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h
-test.o: /usr/include/stdio.h /usr/include/bits/types.h
-test.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h
-test.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
-test.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-test.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stdarg.h
-test.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-test.o: /usr/include/string.h /usr/include/math.h
-test.o: /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h
-test.o: /usr/include/bits/mathcalls.h entity.h /usr/include/GL/gl.h
-test.o: /usr/include/GL/glext.h util.h oct.h view.h txtprt_import.h
-txtprt_import.o: txtprt_import.h entity.h /usr/include/GL/gl.h
-txtprt_import.o: /usr/include/GL/glext.h
-txtprt_import.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h util.h
-txtprt_import.o: oct.h view.h
-util.o: /usr/include/sys/time.h /usr/include/features.h
-util.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-util.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-util.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h
-util.o: /usr/include/bits/typesizes.h /usr/include/time.h
-util.o: /usr/include/bits/time.h /usr/include/sys/select.h
-util.o: /usr/include/bits/select.h /usr/include/bits/sigset.h util.h
-util.o: /usr/include/GL/gl.h /usr/include/GL/glext.h
-view.o: oct.h util.h /usr/include/GL/gl.h /usr/include/GL/glext.h
-view.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h view.h
-entity.o: /usr/include/GL/gl.h /usr/include/GL/glext.h
-entity.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h util.h oct.h
-entity.o: view.h
-matrix.o: util.h /usr/include/GL/gl.h /usr/include/GL/glext.h
-matrix.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h
-oct.o: util.h /usr/include/GL/gl.h /usr/include/GL/glext.h
-oct.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h
-txtprt_import.o: entity.h /usr/include/GL/gl.h /usr/include/GL/glext.h
-txtprt_import.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h util.h
-txtprt_import.o: oct.h view.h
-util.o: /usr/include/GL/gl.h /usr/include/GL/glext.h
-util.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h
-view.o: util.h /usr/include/GL/gl.h /usr/include/GL/glext.h
-view.o: /usr/lib/gcc-lib/x86_64-linux/3.3.4/include/stddef.h
+entity.o: opengl.h util.h entity.h oct.h view.h event.h material.h shader.h
+entity.o: shader_vars.h
+level1.o: entity.h opengl.h util.h oct.h view.h event.h material.h shader.h
+level1.o: shader_vars.h
+material.o: opengl.h material.h util.h shader.h shader_vars.h view.h event.h
+oct.o: opengl.h oct.h util.h view.h event.h entity.h material.h shader.h
+oct.o: shader_vars.h
+shader.o: shader.h opengl.h util.h shader_vars.h
+shader_vars.o: shader_vars.h shader.h opengl.h util.h
+test.o: opengl.h util.h entity.h oct.h view.h event.h material.h shader.h
+test.o: shader_vars.h txtprt_import.h
+txtprt_import.o: txtprt_import.h entity.h opengl.h util.h oct.h view.h
+txtprt_import.o: event.h material.h shader.h shader_vars.h
+util.o: opengl.h util.h entity.h oct.h view.h event.h material.h shader.h
+util.o: shader_vars.h
+view.o: opengl.h view.h util.h event.h oct.h
+x.o: shader.h opengl.h util.h shader_vars.h