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

diff --git a/src/Makefile.am b/src/Makefile.am
index e2ea2fe..fa6c981 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,36 +7,40 @@
 
 #
 # libmoof.a
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 noinst_LIBRARIES = libmoof.a
 
+libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
+
 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 +48,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,24 +65,26 @@ 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)
 
-libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
-
 EXTRA_DIST = Moof/cml Moof/stlplus
 
 
 #
 # yoink
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 bin_PROGRAMS = yoink
 
+yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
+yoink_LDADD = libmoof.a
+
 yoink_SOURCES = \
 				Animation.cc \
 				Animation.hh \
@@ -90,16 +94,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 \
@@ -111,23 +114,25 @@ yoink_SOURCES = \
 				$(ENDLIST)
 
 if WIN32
-yoink_SOURCES += yoink.rc yoink.ico
+yoink_SOURCES += yoink.rc
 .rc.o:
-	@WINDRES@ -o $@ -i $<
-endif
-
-yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
-yoink_LDADD = libmoof.a
-
-
+	$(WINDRES) -o $@ -i $<
+else
 YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"
-
 run: all
 	$(YOINK_ENVIRONMENT) ./yoink $(YOINK_OPTS)
 
 debug: all
 	$(YOINK_ENVIRONMENT) gdb ./yoink
+endif
 
-all-local:	# always rebuild version.c
-	@touch version.c
+if LINK_SH
+yoink$(EXEEXT): $(yoink_OBJECTS) $(yoink_DEPENDENCIES)
+	@rm -f yoink$(EXEEXT)
+	@LINK="$(CXXLINK) $(yoink_OBJECTS) $(yoink_LDADD) $(LIBS)"\
+		sh $(top_srcdir)/link.sh
+
+clean-local:
+	rm -f .link/*
+endif