X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=58b31118846ec4e601bdf0042cfba99ee818d27e;hp=aeab798dfe4ce2260a775e77037d67749e2378bd;hb=e973a129b5b83b628ba3f09e8c95682fc74080cd;hpb=a4debfe4a5f5d339410788971b698ba00cb7f09c

diff --git a/src/Makefile.am b/src/Makefile.am
index aeab798..58b3111 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,62 +14,55 @@ 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/Core.cc \
+					Moof/Core.hh \
 					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 \
 					Moof/Entity.hh \
+					Moof/Error.hh \
 					Moof/Event.hh \
-					Moof/Exception.hh \
 					Moof/Frustum.cc \
 					Moof/Frustum.hh \
 					Moof/Hash.cc \
 					Moof/Hash.hh \
+					Moof/Image.cc \
+					Moof/Image.hh \
 					Moof/Interpolator.hh \
 					Moof/Layer.hh \
+					Moof/Line.hh \
 					Moof/Log.cc \
 					Moof/Log.hh \
+					Moof/Manager.hh \
 					Moof/Math.hh \
-					Moof/Mippleton.hh \
+					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/RigidBody.hh \
 					Moof/Script.hh \
-					Moof/Serializable.cc \
-					Moof/Serializable.hh \
-					Moof/Serializer.cc \
-					Moof/Serializer.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 \
@@ -79,25 +72,9 @@ libmoof_a_SOURCES = \
 					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,16 +84,20 @@ 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 \
+				Main.cc \
+				Main.hh \
 				Scene.cc \
 				Scene.hh \
 				TilemapFont.cc \
@@ -125,12 +106,14 @@ yoink_SOURCES = \
 				TitleLayer.hh \
 				Typesetter.cc \
 				Typesetter.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