X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=4e8f65d0b26b0f47d252050332843f7e227426cd;hp=f10027266a2e646c2b5f7cc5f3b97f6662af6474;hb=ed5fcf5f1357fc42749408f705e9ec55531ff006;hpb=64e3c3202d2c1956759fb4da36ca329816c9369a

diff --git a/src/Makefile.am b/src/Makefile.am
index f100272..4e8f65d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,52 +7,53 @@
 
 #
 # libmoof.a
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 noinst_LIBRARIES = libmoof.a
 
 libmoof_a_SOURCES = \
-					Moof/Aabb.cc \
 					Moof/Aabb.hh \
 					Moof/Camera.cc \
 					Moof/Camera.hh \
 					Moof/ConvertUTF.c \
 					Moof/ConvertUTF.h \
+					Moof/Core.cc \
+					Moof/Core.hh \
 					Moof/Cullable.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/Library.hh \
+					Moof/Line.hh \
 					Moof/Log.cc \
 					Moof/Log.hh \
+					Moof/Manager.hh \
 					Moof/Math.hh \
 					Moof/ModalDialog.hh \
 					Moof/Octree.hh \
 					Moof/OpenGL.hh \
 					Moof/Plane.cc \
 					Moof/Plane.hh \
-					Moof/Rectangle.cc \
-					Moof/Rectangle.hh \
+					Moof/Ray.hh \
 					Moof/Resource.cc \
 					Moof/Resource.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 \
@@ -75,7 +76,7 @@ EXTRA_DIST = Moof/cml Moof/stlplus
 
 #
 # yoink
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 bin_PROGRAMS = yoink
 
@@ -92,25 +93,24 @@ yoink_SOURCES = \
 				Heroine.hh \
 				Hud.cc \
 				Hud.hh \
-				MainLayer.cc \
-				MainLayer.hh \
+				Main.cc \
+				Main.hh \
 				Scene.cc \
 				Scene.hh \
-				Tilemap.cc \
-				Tilemap.hh \
 				TilemapFont.cc \
 				TilemapFont.hh \
 				TitleLayer.cc \
 				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