new classes: resource, tilemap, animation

[chaz/yoink] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a026f96264b8f3e28c4c9dffe4cf547cfe2ae9a1..40dd17331c4d9851e0c0840d301241e99122d133 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,8 @@ libdc_a_SOURCES  = \
                                   random.hh \
                                   rectangle.cc \
                                   rectangle.hh \
                                   random.hh \
                                   rectangle.cc \
                                   rectangle.hh \

+                                  resource.cc \
+                                  resource.hh \

                                   serializable.cc \
                                   serializable.hh \
                                   serializer.cc \
                                   serializable.cc \
                                   serializable.hh \
                                   serializer.cc \


@@ -33,6 +35,7 @@ libdc_a_SOURCES  = \
                                   texture.cc \
                                   texture.hh \
                                   thread.hh \
                                   texture.cc \
                                   texture.hh \
                                   thread.hh \

+                                  tilemap.hh \

                                   timer.cc \
                                   timer.hh \
                                   vector.hh \
                                   timer.cc \
                                   timer.hh \
                                   vector.hh \


@@ -40,7 +43,7 @@ libdc_a_SOURCES  = \
                                   video.hh \
                                   $(ENDLIST)
 
                                   video.hh \
                                   $(ENDLIST)
 

-libdc_a_CPPFLAGS = -I/usr/include/SDL -I$(top_srcdir)/yajl/src -O3
+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_a_LDFLAGS  = -lstdc++ -lSDL_image -lSDL_sound
 libdc_a_LIBADD   = $(top_srcdir)/yajl/libyajl.a
 


@@ -52,7 +55,7 @@ yoink_SOURCES  = \
                                 YoinkApp.hh \
                                 $(ENDLIST)
 
                                 YoinkApp.hh \
                                 $(ENDLIST)
 

-yoink_CPPFLAGS = -I/usr/include/SDL -O3
+yoink_CPPFLAGS = -I/usr/include/SDL -Wall

 #yoink_LDFLAGS  = -lstdc++ -lSDL_image -lSDL_sound
 #yoink_LDFLAGS  = -lstdc++ -lSDL_image -lSDL_sound

-yoink_LDADD    = libdc.a ../yajl/libyajl.a
+yoink_LDADD    = libdc.a libtinyxml.a ../yajl/libyajl.a