Added tinyxml in the build process.

makefile.gcc

@@ -12,6 +12,7 @@ CFLAGS += -Wall -I. -Isrc -Ithird_party		\
 	  -I$(LIBPNG_DIR)			\
 	  -I$(ZLIB_DIR)				\
 	  -I$(LOADPNG_DIR)			\
+	  -I$(TINYXML_DIR)			\
 	  -Wno-deprecated-declarations		\
 	  -DPNG_NO_MMX_CODE
 
@@ -85,6 +86,10 @@ $(LOADPNG_LIB): $(LOADPNG_OBJS)
 	-rm -f $@
 	ar rs $@ $^
 
+$(TINYXML_LIB): $(TINYXML_OBJS)
+	-rm -f $@
+	ar rs $@ $^
+
 ######################################################################
 # Rules to build objects and the application
 
@@ -128,7 +133,8 @@ VPATH = src					\
 	$(LIBJPEG_DIR)				\
 	$(LIBPNG_DIR)				\
 	$(ZLIB_DIR)				\
-	$(LOADPNG_DIR)
+	$(LOADPNG_DIR)				\
+	$(TINYXML_DIR)
 
 ASE_DEPS = $(ASE_OBJS) $(THIRD_PARTY_LIBS)
 
@@ -162,6 +168,9 @@ $(OBJ_DIR)/zlib.%$(OBJ): %.c
 $(OBJ_DIR)/loadpng.%$(OBJ): %.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
+$(OBJ_DIR)/tinyxml.%$(OBJ): %.cpp
+	$(CPP) $(CFLAGS) -o $@ -c $<
+
 ######################################################################
 # Application
 

makefile.lst

@@ -481,6 +481,21 @@ LOADPNG_OBJS = $(addprefix $(OBJ_DIR)/loadpng.,		\
 		 $(addsuffix $(OBJ),			\
 		   $(notdir $(basename $(LOADPNG_SOURCES)))))
 
+######################################################################
+# tinyxml
+
+TINYXML_LIB = $(OBJ_DIR)/libtinyxml$(LIB_EXT)
+TINYXML_DIR = third_party/tinyxml
+TINYXML_SOURCES =					\
+	$(TINYXML_DIR)/tinystr.cpp			\
+	$(TINYXML_DIR)/tinyxml.cpp			\
+	$(TINYXML_DIR)/tinyxmlerror.cpp			\
+	$(TINYXML_DIR)/tinyxmlparser.cpp
+
+TINYXML_OBJS = $(addprefix $(OBJ_DIR)/tinyxml.,		\
+		 $(addsuffix $(OBJ),			\
+		   $(notdir $(basename $(TINYXML_SOURCES)))))
+
 ######################################################################
 # All objects and libraries
 
@@ -491,7 +506,8 @@ ALL_OBJS =					\
 	$(LIBJPEG_OBJS)				\
 	$(LIBPNG_OBJS)				\
 	$(ZLIB_OBJS)				\
-	$(LOADPNG_OBJS)
+	$(LOADPNG_OBJS)				\
+	$(TINYXML_OBJS)
 
 THIRD_PARTY_LIBS =				\
 	$(LIBART_LIB)				\
@@ -499,7 +515,8 @@ THIRD_PARTY_LIBS =				\
 	$(LIBJPEG_LIB)				\
 	$(LIBPNG_LIB)				\
 	$(ZLIB_LIB)				\
-	$(LOADPNG_LIB)
+	$(LOADPNG_LIB)				\
+	$(TINYXML_LIB)
 
 ######################################################################
 # Tests

makefile.vc

@@ -30,6 +30,7 @@ CFLAGS = -nologo						\
 	 -I$(LIBPNG_DIR)					\
 	 -I$(ZLIB_DIR)						\
 	 -I$(LOADPNG_DIR)					\
+	 -I$(TINYXML_DIR)					\
 	 -DPNG_NO_MMX_CODE
 
 LFLAGS = -NOLOGO -SUBSYSTEM:WINDOWS -MACHINE:X86
@@ -120,6 +121,10 @@ $(LOADPNG_LIB): $(LOADPNG_OBJS)
 	-rm -f $@
 	lib -NOLOGO -OUT:$@ $^
 
+$(TINYXML_LIB): $(TINYXML_OBJS)
+	-rm -f $@
+	lib -NOLOGO -OUT:$@ $^
+
 ######################################################################
 # Rules to build objects and the application
 
@@ -163,7 +168,8 @@ VPATH = src					\
 	$(LIBJPEG_DIR)				\
 	$(LIBPNG_DIR)				\
 	$(ZLIB_DIR)				\
-	$(LOADPNG_DIR)
+	$(LOADPNG_DIR)				\
+	$(TINYXML_DIR)
 
 ASE_DEPS = $(ASE_OBJS) $(THIRD_PARTY_LIBS)
 
@@ -194,6 +200,9 @@ $(OBJ_DIR)/zlib.%$(OBJ): %.c
 $(OBJ_DIR)/loadpng.%$(OBJ): %.c
 	$(CC) $(CFLAGS) -Fo$@ -c $<
 
+$(OBJ_DIR)/tinyxml.%$(OBJ): %.cpp
+	$(CC) $(CFLAGS) -Fo$@ -c $<
+
 ######################################################################
 # Application
 

misc/deps.sh

@@ -8,6 +8,8 @@ CFLAGS="-I.					\
 	-Ithird_party/libpng			\
 	-Ithird_party/zlib			\
 	-Ithird_party/jpeg			\
+	-Ithird_party/tinyxml			\
+	-Ithird_party/loadpng			\
 	-Ithird_party/freetype/include		\
 	-Ithird_party"