now using stlplus containers, especially ntree

[chaz/yoink] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0826767c3f359dc3102789f2ae163466d5212491..f4122dec4a3a6659d7531e510db69bb1535f8cf7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,11 @@
 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,13 +18,20 @@ libmoof_la_SOURCES = \
                                   Moof/Drawable.hh \
                                   Moof/Engine.cc \
                                   Moof/Engine.hh \
+                                  Moof/Entity.hh \
                                   Moof/Event.hh \
+                                  Moof/Frustum.cc \
+                                  Moof/Frustum.hh \
+                                  Moof/Hash.cc \
+                                  Moof/Hash.hh \
                                   Moof/Interpolator.hh \
                                   Moof/Math.hh \
                                   Moof/Mippleton.hh \
+                                  Moof/Octree.hh \
                                   Moof/OpenGL.cc \
                                   Moof/OpenGL.hh \
-                                  Moof/Profiler.hh \
+                                  Moof/Plane.cc \
+                                  Moof/Plane.hh \
                                   Moof/Random.cc \
                                   Moof/Random.hh \
                                   Moof/Resource.cc \
@@ -36,6 +45,8 @@ libmoof_la_SOURCES = \
                                   Moof/Settings.cc \
                                   Moof/Settings.hh \
                                   Moof/Singleton.hh \
+                                  Moof/Sphere.cc \
+                                  Moof/Sphere.hh \
                                   Moof/StringTools.cc \
                                   Moof/StringTools.hh \
                                   Moof/Texture.cc \
@@ -72,14 +83,13 @@ yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
 yoink_LDADD    = libmoof.la
 
 
-EXTRA_DIST = Moof/cml
+EXTRA_DIST = Moof/cml Moof/stlplus
 
 
-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