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

diff --git a/src/Makefile.am b/src/Makefile.am
index ca4f81e..61be610 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,83 +1,140 @@
 
-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/dispatcher.cc \
+					moof/dispatcher.hh \
+					moof/drawable.hh \
+					moof/entity.hh \
+					moof/event.hh \
+					moof/frustum.cc \
+					moof/frustum.hh \
+					moof/hash.cc \
+					moof/hash.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/modal_dialog.hh \
+					moof/network.hh \
+					moof/opengl.hh \
+					moof/packet.cc \
+					moof/packet.hh \
+					moof/plane.cc \
+					moof/plane.hh \
+					moof/ray.hh \
+					moof/resource.cc \
+					moof/resource.hh \
+					moof/rigid_body.hh \
+					moof/script.hh \
+					moof/service.cc \
+					moof/service.hh \
+					moof/settings.cc \
+					moof/settings.hh \
+					moof/shape.hh \
+					moof/socket.hh \
+					moof/sound.cc \
+					moof/sound.hh \
+					moof/sphere.hh \
+					moof/string.cc \
+					moof/string.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 \
+				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