Package: epiphany / 0.7.0+0-3

use-shared-tinyxml.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
Subject: build epiphany against shared tinyxml library
From: Ricardo Mones <mones@debian.org>
Forwarded: no
Last-Update: 2014-10-09

diff --git a/configure.in b/configure.in
index bec2e67..8387087 100644
--- a/configure.in
+++ b/configure.in
@@ -6,8 +6,8 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 AC_CHECK_HEADER(SDL/SDL.h,, [echo "Please install SDL from http://www.libsdl.org";exit])
 AC_CHECK_HEADER(SDL/SDL_mixer.h,, [echo "Please install SDL_mixer from http://www.libsdl.org/projects/SDL_mixer/";exit])
-
-
+AC_LANG_PUSH(C++)
+AC_CHECK_HEADER(tinyxml.h,, [echo "Please install tinyxml library from http://www.grinninglizard.com/tinyxml/";exit])
 
 
 AC_CHECK_LIB( SDL,   main,, [
@@ -24,6 +24,13 @@ AC_CHECK_LIB( SDL,   main,, [
         exit
         ])
 
+AC_CHECK_LIB( tinyxml,   main,, [
+        echo "tinyxml installed, but -ltinyxml not found, run 'ldconfig' and try again,"
+        echo "if that doesn't help have a look at the file config.log and look into"
+        echo "the FAQ."
+        exit
+        ])
+
 
 AH_TEMPLATE(DEBUG_MODE)
 [CXXFLAGS=""]
diff --git a/src/Makefile.am b/src/Makefile.am
index cfc2687..9ee1bc1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,11 +14,10 @@ epiphany_game_SOURCES = sfx.cpp main.cpp level.cpp sample.cpp entity.cpp \
 	screen.cpp sprite.cpp menu.cpp game.cpp surface_manager.cpp input.cpp fonts/font.cpp \
 	fonts/font_factory.cpp fonts/font_manager.cpp surface.cpp resource_factory.cpp \
 	menu_entry_ranged.cpp menu_list_epiphany.cpp menu_list_options.cpp \
-	tinyxml/tinystr.cpp tinyxml/tinyxmlerror.cpp tinyxml/tinyxmlparser.cpp \
-	tinyxml/tinyxml.cpp menu_entry_bool.cpp music_manager.cpp xml_configuration.cpp \
+	menu_entry_bool.cpp music_manager.cpp xml_configuration.cpp \
 	commandline_configuration.cpp
 
-epiphany_game_LDADD = -lSDL -lSDL_mixer
+epiphany_game_LDADD = -lSDL -lSDL_mixer -ltinyxml
 
 
 noinst_HEADERS = entity_type.h emdlparser.h levelmap.h \
@@ -35,6 +34,6 @@ noinst_HEADERS = entity_type.h emdlparser.h levelmap.h \
 	entities/entity_gem.h entities/entity_emerald.h entities/entity_tomato.h \
 	resource_factory.h sprite.h epimap.h entity.h \
 	menu_entry.h menu_entry_simple.h menu_entry_ranged.h menu_list.h \
-	menu_list_epiphany.h menu_list_options.h tinyxml/tinystr.h \
-	tinyxml/tinyxml.h menu_entry_bool.h music_manager.h abstract_configuration.h \
-	xml_configuration.h commandline_configuration.h
\ No newline at end of file
+	menu_list_epiphany.h menu_list_options.h \
+	menu_entry_bool.h music_manager.h abstract_configuration.h \
+	xml_configuration.h commandline_configuration.h
diff --git a/src/epiconfig.cpp b/src/epiconfig.cpp
index aa62bed..db3e60d 100644
--- a/src/epiconfig.cpp
+++ b/src/epiconfig.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #include "epiconfig.h"
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
 #include <cstdlib>
 #include "sprite.h"
 
diff --git a/src/xml_configuration.cpp b/src/xml_configuration.cpp
index 7e36af5..03d5a17 100644
--- a/src/xml_configuration.cpp
+++ b/src/xml_configuration.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <cstring>
 #include <cassert>
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>