X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=fbfc46b40049c9549c8ae6ceb21ae8606343aa19;hp=0826767c3f359dc3102789f2ae163466d5212491;hb=96dd0815b98cf9459c8dd7a8009aabb6f8051e9e;hpb=16d1a05b0777e97a45c48e2874aa4e5cc791282e

diff --git a/src/Makefile.am b/src/Makefile.am
index 0826767..fbfc46b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,15 @@
 
+SUBDIRS = Moof/yajl
+
+
 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 \
@@ -16,17 +21,30 @@ libmoof_la_SOURCES = \
 				   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/OpenGL.cc \
+				   Moof/Octree.cc \
+				   Moof/Octree.hh \
 				   Moof/OpenGL.hh \
-				   Moof/Profiler.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/RK4.hh \
 				   Moof/Scene.cc \
 				   Moof/Scene.hh \
 				   Moof/Serializable.cc \
@@ -35,7 +53,10 @@ libmoof_la_SOURCES = \
 				   Moof/Serializer.hh \
 				   Moof/Settings.cc \
 				   Moof/Settings.hh \
-				   Moof/Singleton.hh \
+				   Moof/Sound.cc \
+				   Moof/Sound.hh \
+				   Moof/Sphere.cc \
+				   Moof/Sphere.hh \
 				   Moof/StringTools.cc \
 				   Moof/StringTools.hh \
 				   Moof/Texture.cc \
@@ -51,8 +72,8 @@ libmoof_la_SOURCES = \
 				   Moof/fastevents.h \
 				   $(ENDLIST)
 
-libmoof_la_CPPFLAGS = -I$(top_srcdir)/src/Moof -I$(top_srcdir)/yajl/src
-libmoof_la_LIBADD   = $(top_srcdir)/yajl/libyajl.la
+libmoof_la_CPPFLAGS = -I$(top_srcdir)/src/Moof -I$(top_srcdir)/src/Moof/yajl/src
+libmoof_la_LIBADD   = $(top_srcdir)/src/Moof/yajl/libyajl.la
 
 
 bin_PROGRAMS   = yoink
@@ -60,6 +81,8 @@ bin_PROGRAMS   = yoink
 yoink_SOURCES  = \
 				 Character.cc \
 				 Character.hh \
+				 Hud.cc \
+				 Hud.hh \
 				 TilemapFont.cc \
 				 TilemapFont.hh \
 				 Typesetter.cc \
@@ -72,14 +95,13 @@ yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
 yoink_LDADD    = libmoof.la
 
 
-EXTRA_DIST = Moof/cml
+EXTRA_DIST = Moof/cml Moof/stlplus Moof/yajl
 
 
-YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data" \
-					YOINKRC="$(top_srcdir)/data/yoinkrc"
+YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"
 
 run: all
-	$(YOINK_ENVIRONMENT) ./yoink
+	$(YOINK_ENVIRONMENT) ./yoink $(YOINK_OPTS)
 
 debug: all
 	$(YOINK_ENVIRONMENT) gdb ./yoink