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

diff --git a/src/Makefile.am b/src/Makefile.am
index fbfc46b..f100272 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,101 +1,120 @@
 
-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 \
-				   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.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 \
-				   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)
-
-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
-
-yoink_SOURCES  = \
-				 Character.cc \
-				 Character.hh \
-				 Hud.cc \
-				 Hud.hh \
-				 TilemapFont.cc \
-				 TilemapFont.hh \
-				 Typesetter.cc \
-				 Typesetter.hh \
-				 YoinkApp.cc \
-				 YoinkApp.hh \
-				 $(ENDLIST)
+#
+# Yoink
+# Process this file with automake to produce a Makefile.
+#
+
+
+#
+# libmoof.a
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+noinst_LIBRARIES = libmoof.a
+
+libmoof_a_SOURCES = \
+					Moof/Aabb.cc \
+					Moof/Aabb.hh \
+					Moof/Camera.cc \
+					Moof/Camera.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/Event.hh \
+					Moof/Exception.hh \
+					Moof/Frustum.cc \
+					Moof/Frustum.hh \
+					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/ModalDialog.hh \
+					Moof/Octree.hh \
+					Moof/OpenGL.hh \
+					Moof/Plane.cc \
+					Moof/Plane.hh \
+					Moof/Rectangle.cc \
+					Moof/Rectangle.hh \
+					Moof/Resource.cc \
+					Moof/Resource.hh \
+					Moof/RigidBody.hh \
+					Moof/Script.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/Timer.cc \
+					Moof/Timer.hh \
+					Moof/Transition.hh \
+					Moof/Video.cc \
+					Moof/Video.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_SOURCES = \
+				Animation.cc \
+				Animation.hh \
+				Character.cc \
+				Character.hh \
+				ErrorHandler.cc \
+				ErrorHandler.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 \
+				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.la
-
-
-EXTRA_DIST = Moof/cml Moof/stlplus Moof/yajl
+yoink_LDADD = libmoof.a
 
 
 YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"