X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=766d4ce1480b0d00da9b4b63eb5d6d813dc569db;hp=384fa0a55c1fb9801902834431829d02d074cae0;hb=a723e23ca2d32e8eed32f9c53323afbbedba575b;hpb=9351bfa7871c88a5ad6e63f1d9c4483f50e4fed1

diff --git a/src/Makefile.am b/src/Makefile.am
index 384fa0a..766d4ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,17 +14,13 @@ noinst_LIBRARIES = libmoof.a
 libmoof_a_SOURCES = \
 					Moof/Aabb.cc \
 					Moof/Aabb.hh \
-					Moof/Animation.cc \
-					Moof/Animation.hh \
 					Moof/Camera.cc \
 					Moof/Camera.hh \
 					Moof/ConvertUTF.c \
 					Moof/ConvertUTF.h \
 					Moof/Cullable.hh \
-					Moof/Deserializer.cc \
-					Moof/Deserializer.hh \
-					Moof/Dispatcher.cc \
-					Moof/Dispatcher.hh \
+					Moof/Dispatch.cc \
+					Moof/Dispatch.hh \
 					Moof/Drawable.hh \
 					Moof/Engine.cc \
 					Moof/Engine.hh \
@@ -36,68 +32,47 @@ libmoof_a_SOURCES = \
 					Moof/Hash.cc \
 					Moof/Hash.hh \
 					Moof/Interpolator.hh \
+					Moof/Layer.hh \
+					Moof/Library.hh \
+					Moof/Line.hh \
 					Moof/Log.cc \
 					Moof/Log.hh \
 					Moof/Math.hh \
-					Moof/Mippleton.hh \
-					Moof/Octree.cc \
+					Moof/ModalDialog.hh \
 					Moof/Octree.hh \
 					Moof/OpenGL.hh \
 					Moof/Plane.cc \
 					Moof/Plane.hh \
-					Moof/Random.cc \
-					Moof/Random.hh \
+					Moof/Ray.hh \
 					Moof/Rectangle.cc \
 					Moof/Rectangle.hh \
 					Moof/Resource.cc \
 					Moof/Resource.hh \
-					Moof/RK4.hh \
-					Moof/Scene.cc \
-					Moof/Scene.hh \
-					Moof/Serializable.cc \
-					Moof/Serializable.hh \
-					Moof/Serializer.cc \
-					Moof/Serializer.hh \
+					Moof/RigidBody.hh \
+					Moof/Script.hh \
 					Moof/Settings.cc \
 					Moof/Settings.hh \
+					Moof/Shape.hh \
 					Moof/Sound.cc \
 					Moof/Sound.hh \
-					Moof/Sphere.cc \
 					Moof/Sphere.hh \
 					Moof/StringTools.cc \
 					Moof/StringTools.hh \
 					Moof/Texture.cc \
 					Moof/Texture.hh \
 					Moof/Thread.hh \
-					Moof/Tilemap.cc \
-					Moof/Tilemap.hh \
 					Moof/Timer.cc \
 					Moof/Timer.hh \
+					Moof/Transition.hh \
 					Moof/Video.cc \
 					Moof/Video.hh \
 					Moof/fastevents.c \
 					Moof/fastevents.h \
 					$(ENDLIST)
 
-libmoof_a_SOURCES += \
-					 Moof/yajl/src/yajl.c \
-					 Moof/yajl/src/yajl_alloc.c \
-					 Moof/yajl/src/yajl_alloc.h \
-					 Moof/yajl/src/yajl_buf.c \
-					 Moof/yajl/src/yajl_buf.h \
-					 Moof/yajl/src/yajl_bytestack.h \
-					 Moof/yajl/src/yajl_encode.c \
-					 Moof/yajl/src/yajl_encode.h \
-					 Moof/yajl/src/yajl_gen.c \
-					 Moof/yajl/src/yajl_lex.c \
-					 Moof/yajl/src/yajl_lex.h \
-					 Moof/yajl/src/yajl_parser.c \
-					 Moof/yajl/src/yajl_parser.h \
-					 $(ENDLIST)
+libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
 
-libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof -I$(top_srcdir)/src/Moof/yajl/src
-
-EXTRA_DIST = Moof/cml Moof/stlplus Moof/yajl
+EXTRA_DIST = Moof/cml Moof/stlplus
 
 
 #
@@ -107,22 +82,38 @@ EXTRA_DIST = Moof/cml Moof/stlplus Moof/yajl
 bin_PROGRAMS = yoink
 
 yoink_SOURCES = \
+				Animation.cc \
+				Animation.hh \
 				Character.cc \
 				Character.hh \
+				ErrorHandler.cc \
+				ErrorHandler.hh \
+				GameLayer.cc \
+				GameLayer.hh \
+				Heroine.cc \
+				Heroine.hh \
 				Hud.cc \
 				Hud.hh \
+				MainLayer.cc \
+				MainLayer.hh \
+				Scene.cc \
+				Scene.hh \
+				Tilemap.cc \
+				Tilemap.hh \
 				TilemapFont.cc \
 				TilemapFont.hh \
+				TitleLayer.cc \
+				TitleLayer.hh \
 				Typesetter.cc \
 				Typesetter.hh \
-				YoinkApp.cc \
-				YoinkApp.hh \
+				version.c \
+				version.h \
 				$(ENDLIST)
 
 if WIN32
 yoink_SOURCES += yoink.rc yoink.ico
 .rc.o:
-	@WINDRES@ -o $@ -i $<
+	$(AM_V_GEN) $(WINDRES) -o $@ -i $<
 endif
 
 yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof