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