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

diff --git a/src/Makefile.am b/src/Makefile.am
index ff31804..61be610 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,137 +7,134 @@
 
 #
 # libmoof.a
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 noinst_LIBRARIES = libmoof.a
 
+libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/moof
+
 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 \
-					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/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/Script.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 \
+					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)
 
-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 -I$(top_srcdir)/src/Moof/yajl/src
-
-EXTRA_DIST = Moof/cml Moof/stlplus Moof/yajl
+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 \
-				MainLayer.cc \
-				MainLayer.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 yoink.ico
+yoink_SOURCES += yoink.rc
 .rc.o:
-	@WINDRES@ -o $@ -i $<
-endif
-
-yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
-yoink_LDADD = libmoof.a
-
-
+	$(WINDRES) -o $@ -i $<
+else
 YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"
-
 run: all
 	$(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