X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=fa6c9814273a2e3e3adc62eacae71a6a217637b0;hp=ca4f81ef3f86e19d104a7bb0f2ec5574ca1ccb0a;hb=d08114d4e7315636ff62127845150273e0cbf66f;hpb=838bc00015eb7f583c7cf4b3b1007697bf047da1

diff --git a/src/Makefile.am b/src/Makefile.am
index ca4f81e..fa6c981 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,83 +1,138 @@
 
-noinst_LTLIBRARIES = libdc.la
-
-libdc_la_SOURCES = \
-				   ConvertUTF.c \
-				   ConvertUTF.h \
-				   aabb.hh \
-				   animation.cc \
-				   animation.hh \
-				   deserializer.cc \
-				   deserializer.hh \
-				   dispatcher.cc \
-				   dispatcher.hh \
-				   drawable.hh \
-				   engine.cc \
-				   engine.hh \
-				   event.hh \
-				   fastevents.c \
-				   fastevents.h \
-				   interpolator.hh \
-				   math.hh \
-				   mippleton.hh \
-				   opengl.hh \
-				   profiler.hh \
-				   random.cc \
-				   random.hh \
-				   resource.cc \
-				   resource.hh \
-				   scene.cc \
-				   scene.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.cc \
-				   tilemap.hh \
-				   timer.cc \
-				   timer.hh \
-				   video.cc \
-				   video.hh \
-				   $(ENDLIST)
-
-libdc_la_CPPFLAGS = -I/usr/include/SDL -I$(top_srcdir)/yajl/src
-libdc_la_LIBADD   = $(top_srcdir)/yajl/libyajl.la
-
-
-bin_PROGRAMS   = yoink
-
-yoink_SOURCES  = \
-				 Character.cc \
-				 Character.hh \
-				 TilemapFont.cc \
-				 TilemapFont.hh \
-				 Typesetter.cc \
-				 Typesetter.hh \
-				 YoinkApp.cc \
-				 YoinkApp.hh \
-				 $(ENDLIST)
-
-yoink_CPPFLAGS = -I/usr/include/SDL
-yoink_LDADD    = libdc.la
-
-
-EXTRA_DIST = cml
-
-
-YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data" \
-					YOINK_CONFIGFILE="$(top_srcdir)/data/yoinkrc"
+#
+# Yoink
+# Process this file with automake to produce a Makefile.
+#
 
+
+#
+# libmoof.a
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+noinst_LIBRARIES = libmoof.a
+
+libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
+
+libmoof_a_SOURCES = \
+					Moof/Aabb.cc \
+					Moof/Aabb.hh \
+					Moof/Backend.cc \
+					Moof/Backend.hh \
+					Moof/Camera.cc \
+					Moof/Camera.hh \
+					Moof/Contact.hh \
+					Moof/ConvertUTF.c \
+					Moof/ConvertUTF.h \
+					Moof/Cullable.hh \
+					Moof/Dispatch.cc \
+					Moof/Dispatch.hh \
+					Moof/Drawable.hh \
+					Moof/Entity.hh \
+					Moof/Error.hh \
+					Moof/Event.hh \
+					Moof/Frustum.cc \
+					Moof/Frustum.hh \
+					Moof/HashTools.cc \
+					Moof/HashTools.hh \
+					Moof/Image.cc \
+					Moof/Image.hh \
+					Moof/Interpolator.hh \
+					Moof/Line.hh \
+					Moof/Log.cc \
+					Moof/Log.hh \
+					Moof/Manager.hh \
+					Moof/Math.hh \
+					Moof/ModalDialog.hh \
+					Moof/Octree.hh \
+					Moof/OpenGL.hh \
+					Moof/Plane.cc \
+					Moof/Plane.hh \
+					Moof/Ray.hh \
+					Moof/Resource.cc \
+					Moof/Resource.hh \
+					Moof/RigidBody.hh \
+					Moof/Script.hh \
+					Moof/Settings.cc \
+					Moof/Settings.hh \
+					Moof/Shape.hh \
+					Moof/Sound.cc \
+					Moof/Sound.hh \
+					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/Video.cc \
+					Moof/Video.hh \
+					Moof/View.cc \
+					Moof/View.hh \
+					Moof/fastevents.c \
+					Moof/fastevents.h \
+					$(ENDLIST)
+
+EXTRA_DIST = Moof/cml Moof/stlplus
+
+
+#
+# yoink
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+bin_PROGRAMS = yoink
+
+yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
+yoink_LDADD = libmoof.a
+
+yoink_SOURCES = \
+				Animation.cc \
+				Animation.hh \
+				Character.cc \
+				Character.hh \
+				ErrorHandler.cc \
+				ErrorHandler.hh \
+				GameLayer.cc \
+				GameLayer.hh \
+				GameState.hh \
+				Heroine.cc \
+				Heroine.hh \
+				Hud.cc \
+				Hud.hh \
+				Main.cc \
+				Main.hh \
+				Scene.cc \
+				Scene.hh \
+				TilemapFont.cc \
+				TilemapFont.hh \
+				TitleLayer.cc \
+				TitleLayer.hh \
+				Typesetter.cc \
+				Typesetter.hh \
+				version.c \
+				version.h \
+				$(ENDLIST)
+
+if WIN32
+yoink_SOURCES += yoink.rc
+.rc.o:
+	$(WINDRES) -o $@ -i $<
+else
+YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"
 run: all
-	$(YOINK_ENVIRONMENT) ./yoink
+	$(YOINK_ENVIRONMENT) ./yoink $(YOINK_OPTS)
 
 debug: all
 	$(YOINK_ENVIRONMENT) gdb ./yoink
+endif
+
+if LINK_SH
+yoink$(EXEEXT): $(yoink_OBJECTS) $(yoink_DEPENDENCIES)
+	@rm -f yoink$(EXEEXT)
+	@LINK="$(CXXLINK) $(yoink_OBJECTS) $(yoink_LDADD) $(LIBS)"\
+		sh $(top_srcdir)/link.sh
+
+clean-local:
+	rm -f .link/*
+endif