X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=b63b7d2aa431f1cbe14240c157439a2910b32b59;hp=e2ea2fe75e30ecf5f81151bfef2fba156088c06a;hb=00612586426be6d9a976f141a25ffc1f0d284501;hpb=2d77fb5fb3480f522658f30af6addd5146530517

diff --git a/src/Makefile.am b/src/Makefile.am
index e2ea2fe..b63b7d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,36 +7,38 @@
 
 #
 # libmoof.a
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 noinst_LIBRARIES = libmoof.a
 
 libmoof_a_SOURCES = \
 					Moof/Aabb.cc \
 					Moof/Aabb.hh \
+					Moof/Backend.cc \
+					Moof/Backend.hh \
 					Moof/Camera.cc \
 					Moof/Camera.hh \
+					Moof/Contact.hh \
 					Moof/ConvertUTF.c \
 					Moof/ConvertUTF.h \
 					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/HashTools.cc \
+					Moof/HashTools.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 \
@@ -44,8 +46,6 @@ libmoof_a_SOURCES = \
 					Moof/Plane.cc \
 					Moof/Plane.hh \
 					Moof/Ray.hh \
-					Moof/Rectangle.cc \
-					Moof/Rectangle.hh \
 					Moof/Resource.cc \
 					Moof/Resource.hh \
 					Moof/RigidBody.hh \
@@ -63,9 +63,10 @@ libmoof_a_SOURCES = \
 					Moof/Thread.hh \
 					Moof/Timer.cc \
 					Moof/Timer.hh \
-					Moof/Transition.hh \
 					Moof/Video.cc \
 					Moof/Video.hh \
+					Moof/View.cc \
+					Moof/View.hh \
 					Moof/fastevents.c \
 					Moof/fastevents.h \
 					$(ENDLIST)
@@ -77,7 +78,7 @@ EXTRA_DIST = Moof/cml Moof/stlplus
 
 #
 # yoink
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 bin_PROGRAMS = yoink
 
@@ -90,16 +91,15 @@ yoink_SOURCES = \
 				ErrorHandler.hh \
 				GameLayer.cc \
 				GameLayer.hh \
+				GameState.hh \
 				Heroine.cc \
 				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 \
@@ -113,7 +113,7 @@ yoink_SOURCES = \
 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
@@ -126,8 +126,5 @@ run: all
 	$(YOINK_ENVIRONMENT) ./yoink $(YOINK_OPTS)
 
 debug: all
-	$(YOINK_ENVIRONMENT) gdb ./yoink
-
-all-local:	# always rebuild version.c
-	@touch version.c
+	$(YOINK_ENVIRONMENT) ddd ./yoink