X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=8b3900c21ae9abb203f5f5b11599ecede29abf63;hp=40dd17331c4d9851e0c0840d301241e99122d133;hb=f72400af4fa3e7b54dab154b5a2b6503a6f9af18;hpb=6dfcfbd4a612230f2037cf891dd98520cb80c997

diff --git a/src/Makefile.am b/src/Makefile.am
index 40dd173..8b3900c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,61 +1,106 @@
 
-noinst_LIBRARIES = libdc.a
-
-libdc_a_SOURCES  = \
-				   ConvertUTF.c \
-				   ConvertUTF.h \
-				   deserializer.cc \
-				   deserializer.hh \
-				   dispatcher.cc \
-				   dispatcher.hh \
-				   engine.cc \
-				   engine.hh \
-				   fastevents.c \
-				   fastevents.h \
-				   math.cc \
-				   math.hh \
-				   matrix.hh \
-				   opengl.hh \
-				   quaternion.hh \
-				   random.cc \
-				   random.hh \
-				   rectangle.cc \
-				   rectangle.hh \
-				   resource.cc \
-				   resource.hh \
-				   serializable.cc \
-				   serializable.hh \
-				   serializer.cc \
-				   serializer.hh \
-				   settings.cc \
-				   settings.hh \
-				   singleton.hh \
-				   stringtools.cc \
-				   stringtools.hh \
-				   texture.cc \
-				   texture.hh \
-				   thread.hh \
-				   tilemap.hh \
-				   timer.cc \
-				   timer.hh \
-				   vector.hh \
-				   video.cc \
-				   video.hh \
+noinst_LTLIBRARIES = libmoof.la
+
+libmoof_la_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/Drawable.hh \
+				   Moof/Engine.cc \
+				   Moof/Engine.hh \
+				   Moof/Entity.hh \
+				   Moof/Event.hh \
+				   Moof/Exception.hh \
+				   Moof/Frustum.cc \
+				   Moof/Frustum.hh \
+				   Moof/Hash.cc \
+				   Moof/Hash.hh \
+				   Moof/Interpolator.hh \
+				   Moof/Log.cc \
+				   Moof/Log.hh \
+				   Moof/Math.hh \
+				   Moof/Mippleton.hh \
+				   Moof/Octree.cc \
+				   Moof/Octree.hh \
+				   Moof/OpenGL.cc \
+				   Moof/OpenGL.hh \
+				   Moof/Physics.hh \
+				   Moof/Plane.cc \
+				   Moof/Plane.hh \
+				   Moof/Random.cc \
+				   Moof/Random.hh \
+				   Moof/Rectangle.cc \
+				   Moof/Rectangle.hh \
+				   Moof/Resource.cc \
+				   Moof/Resource.hh \
+				   Moof/Scene.cc \
+				   Moof/Scene.hh \
+				   Moof/Serializable.cc \
+				   Moof/Serializable.hh \
+				   Moof/Serializer.cc \
+				   Moof/Serializer.hh \
+				   Moof/Settings.cc \
+				   Moof/Settings.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/Video.cc \
+				   Moof/Video.hh \
+				   Moof/fastevents.c \
+				   Moof/fastevents.h \
 				   $(ENDLIST)
 
-libdc_a_CPPFLAGS = -I/usr/include/SDL -I$(top_srcdir)/yajl/src -Wall
-#libdc_a_LDFLAGS  = -lstdc++ -lSDL_image -lSDL_sound
-libdc_a_LIBADD   = $(top_srcdir)/yajl/libyajl.a
+libmoof_la_CPPFLAGS = -I$(top_srcdir)/src/Moof -I$(top_srcdir)/yajl/src
+libmoof_la_LIBADD   = $(top_srcdir)/yajl/libyajl.la
 
 
 bin_PROGRAMS   = yoink
 
 yoink_SOURCES  = \
+				 Character.cc \
+				 Character.hh \
+				 Hud.cc \
+				 Hud.hh \
+				 TilemapFont.cc \
+				 TilemapFont.hh \
+				 Typesetter.cc \
+				 Typesetter.hh \
 				 YoinkApp.cc \
 				 YoinkApp.hh \
 				 $(ENDLIST)
 
-yoink_CPPFLAGS = -I/usr/include/SDL -Wall
-#yoink_LDFLAGS  = -lstdc++ -lSDL_image -lSDL_sound
-yoink_LDADD    = libdc.a libtinyxml.a ../yajl/libyajl.a
+yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
+yoink_LDADD    = libmoof.la
+
+
+EXTRA_DIST = Moof/cml Moof/stlplus
+
+
+YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"
+
+run: all
+	$(YOINK_ENVIRONMENT) ./yoink $(YOINK_OPTS)
+
+debug: all
+	$(YOINK_ENVIRONMENT) gdb ./yoink