X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=0c9b062b892dff0e614e8e0a69ead4133e625120;hp=40dd17331c4d9851e0c0840d301241e99122d133;hb=87bc17e55b0c1dc73ecc66df856d3f08fd7a7724;hpb=6dfcfbd4a612230f2037cf891dd98520cb80c997

diff --git a/src/Makefile.am b/src/Makefile.am
index 40dd173..0c9b062 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,28 +1,33 @@
 
-noinst_LIBRARIES = libdc.a
+noinst_LTLIBRARIES = libdc.la
 
-libdc_a_SOURCES  = \
+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 \
-				   math.cc \
+				   interpolator.hh \
 				   math.hh \
-				   matrix.hh \
+				   mippleton.hh \
 				   opengl.hh \
-				   quaternion.hh \
+				   profiler.hh \
 				   random.cc \
 				   random.hh \
-				   rectangle.cc \
-				   rectangle.hh \
 				   resource.cc \
 				   resource.hh \
+				   scene.cc \
+				   scene.hh \
 				   serializable.cc \
 				   serializable.hh \
 				   serializer.cc \
@@ -35,27 +40,43 @@ libdc_a_SOURCES  = \
 				   texture.cc \
 				   texture.hh \
 				   thread.hh \
+				   tilemap.cc \
 				   tilemap.hh \
 				   timer.cc \
 				   timer.hh \
-				   vector.hh \
 				   video.cc \
 				   video.hh \
 				   $(ENDLIST)
 
-libdc_a_CPPFLAGS = -I/usr/include/SDL -I$(top_srcdir)/yajl/src -Wall
-#libdc_a_LDFLAGS  = -lstdc++ -lSDL_image -lSDL_sound
-libdc_a_LIBADD   = $(top_srcdir)/yajl/libyajl.a
+libdc_la_CPPFLAGS = -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 -Wall
-#yoink_LDFLAGS  = -lstdc++ -lSDL_image -lSDL_sound
-yoink_LDADD    = libdc.a libtinyxml.a ../yajl/libyajl.a
+yoink_LDADD    = libdc.la
+
+
+EXTRA_DIST = cml
+
+
+YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data" \
+					YOINKRC="$(top_srcdir)/data/yoinkrc"
+
+run: all
+	$(YOINK_ENVIRONMENT) ./yoink
+
+debug: all
+	$(YOINK_ENVIRONMENT) gdb ./yoink