renamed mippleton to library

[chaz/yoink] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 30f2bae88f3cbeb2ed24f4f21770e056e11f4475..c10b58660c566f214cd5f2be93b85b76451373b6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,15 +14,11 @@ noinst_LIBRARIES = libmoof.a
 libmoof_a_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 \
@@ -36,11 +32,11 @@ libmoof_a_SOURCES = \
                                        Moof/Hash.cc \
                                        Moof/Hash.hh \
                                        Moof/Interpolator.hh \
+                                       Moof/Layer.hh \
+                                       Moof/Library.hh \
                                        Moof/Log.cc \
                                        Moof/Log.hh \
                                        Moof/Math.hh \
-                                       Moof/Mippleton.hh \
-                                       Moof/Octree.cc \
                                        Moof/Octree.hh \
                                        Moof/OpenGL.hh \
                                        Moof/Plane.cc \
@@ -51,13 +47,8 @@ libmoof_a_SOURCES = \
                                        Moof/Rectangle.hh \
                                        Moof/Resource.cc \
                                        Moof/Resource.hh \
-                                       Moof/RK4.hh \
-                                       Moof/Scene.cc \
-                                       Moof/Scene.hh \
-                                       Moof/Serializable.cc \
-                                       Moof/Serializable.hh \
-                                       Moof/Serializer.cc \
-                                       Moof/Serializer.hh \
+                                       Moof/RigidBody.hh \
+                                       Moof/Script.hh \
                                        Moof/Settings.cc \
                                        Moof/Settings.hh \
                                        Moof/Sound.cc \
@@ -69,35 +60,18 @@ libmoof_a_SOURCES = \
                                        Moof/Texture.cc \
                                        Moof/Texture.hh \
                                        Moof/Thread.hh \
-                                       Moof/Tilemap.cc \
-                                       Moof/Tilemap.hh \
                                        Moof/Timer.cc \
                                        Moof/Timer.hh \
+                                       Moof/Transition.hh \
                                        Moof/Video.cc \
                                        Moof/Video.hh \
                                        Moof/fastevents.c \
                                        Moof/fastevents.h \
                                        $(ENDLIST)
 
-libmoof_a_SOURCES += \
-                                        Moof/yajl/src/yajl.c \
-                                        Moof/yajl/src/yajl_alloc.c \
-                                        Moof/yajl/src/yajl_alloc.h \
-                                        Moof/yajl/src/yajl_buf.c \
-                                        Moof/yajl/src/yajl_buf.h \
-                                        Moof/yajl/src/yajl_bytestack.h \
-                                        Moof/yajl/src/yajl_encode.c \
-                                        Moof/yajl/src/yajl_encode.h \
-                                        Moof/yajl/src/yajl_gen.c \
-                                        Moof/yajl/src/yajl_lex.c \
-                                        Moof/yajl/src/yajl_lex.h \
-                                        Moof/yajl/src/yajl_parser.c \
-                                        Moof/yajl/src/yajl_parser.h \
-                                        $(ENDLIST)
+libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
 
-libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof -I$(top_srcdir)/src/Moof/yajl/src
-
-EXTRA_DIST = Moof/cml Moof/stlplus Moof/yajl
+EXTRA_DIST = Moof/cml Moof/stlplus
 
 
 #
@@ -107,18 +81,37 @@ EXTRA_DIST = Moof/cml Moof/stlplus Moof/yajl
 bin_PROGRAMS = yoink
 
 yoink_SOURCES = \
+                               Animation.cc \
+                               Animation.hh \
                                Character.cc \
                                Character.hh \
+                               GameLayer.cc \
+                               GameLayer.hh \
+                               Heroine.cc \
+                               Heroine.hh \
                                Hud.cc \
                                Hud.hh \
+                               MainLayer.cc \
+                               MainLayer.hh \
+                               Scene.cc \
+                               Scene.hh \
+                               Tilemap.cc \
+                               Tilemap.hh \
                                TilemapFont.cc \
                                TilemapFont.hh \
+                               TitleLayer.cc \
+                               TitleLayer.hh \
                                Typesetter.cc \
                                Typesetter.hh \
-                               YoinkApp.cc \
-                               YoinkApp.hh \
+                               version.h \
                                $(ENDLIST)
 
+if WIN32
+yoink_SOURCES += yoink.rc yoink.ico
+.rc.o:
+       @WINDRES@ -o $@ -i $<
+endif
+
 yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
 yoink_LDADD = libmoof.a