From: Ansgar Burchardt <ansgar@debian.org>
Date: Sun, 14 Aug 2011 14:08:35 +0200
Subject: Use tinyxml system library
Origin: vendor
--- tecnoballz.orig/include/handler_levels.h
+++ tecnoballz/include/handler_levels.h
@@ -32,7 +32,7 @@
class handler_levels;
#include "../include/tecnoballz.h"
-#include "../include/tinyxml.h"
+#include <tinyxml.h>
#include <string.h>
typedef struct
--- tecnoballz.orig/include/tinystr.h
+++ tecnoballz/include/tinystr.h
@@ -34,6 +34,8 @@
* - added swap(), clear(), size(), capacity(), operator+().
*/
+#error "Embedded copy of libtinyxml-dev should not be used."
+
#ifndef TIXML_USE_STL
#ifndef TIXML_STRING_INCLUDED
--- tecnoballz.orig/include/tinyxml.h
+++ tecnoballz/include/tinyxml.h
@@ -22,6 +22,7 @@
distribution.
*/
+#error "Embedded copy of libtinyxml-dev should not be used."
#ifndef TINYXML_INCLUDED
#define TINYXML_INCLUDED
--- tecnoballz.orig/src/Makefile.am
+++ tecnoballz/src/Makefile.am
@@ -9,7 +9,7 @@
games_PROGRAMS = tecnoballz
tecnoballz_SOURCES = $(SOURCES_MAIN)
tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@
-tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MIKMOD_LIBS@ -L.
+tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MIKMOD_LIBS@ -ltinyxml -L.
SOURCES_MAIN = \
bitmap_data.cc \
@@ -81,9 +81,5 @@
tecnoballz.cc \
tiles_background.cc \
tilesmap_scrolling.cc \
- tinyxml.cc \
- tinyxmlerror.cc \
- tinyxmlparser.cc \
- tinystr.cc
$(NULL)
--- tecnoballz.orig/src/handler_levels.cc
+++ tecnoballz/src/handler_levels.cc
@@ -29,7 +29,7 @@
using namespace std;
#include "../include/handler_levels.h"
#include "../include/handler_resources.h"
-#include "../include/tinyxml.h"
+#include <tinyxml.h>
#include <string.h>
#include <sstream>
@@ -143,7 +143,7 @@
Sint32 type = parent->Type ();
switch (type)
{
- case TiXmlNode::ELEMENT:
+ case TiXmlNode::TINYXML_ELEMENT:
{
string element = parent->Value ();
if (element == "level")
@@ -221,7 +221,7 @@
string name;
switch (type)
{
- case TiXmlNode::ELEMENT:
+ case TiXmlNode::TINYXML_ELEMENT:
{
element = parent->ToElement ();
last_element = parent->Value ();
@@ -290,7 +290,7 @@
break;
- case TiXmlNode::TEXT:
+ case TiXmlNode::TINYXML_TEXT:
text = parent->ToText ();
value_str = text->Value ();