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
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 87b28ab..2ec725c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,14 @@
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_STL" )
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(TinyXml REQUIRED tinyxml)
+
INCLUDE_DIRECTORIES(
${SDL_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
${FREETYPE_INCLUDE_DIRS}
${SDLMIXER_INCLUDE_DIR}
+ ${TINYXML_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
@@ -12,7 +16,6 @@ ADD_SUBDIRECTORY( input )
ADD_SUBDIRECTORY( core )
ADD_SUBDIRECTORY( game )
ADD_SUBDIRECTORY( math )
-ADD_SUBDIRECTORY( tinyxml )
ADD_SUBDIRECTORY( video )
ADD_SUBDIRECTORY( audio )
ADD_SUBDIRECTORY( sketch )
@@ -25,5 +28,5 @@ ADD_EXECUTABLE(
)
TARGET_LINK_LIBRARIES(
- jvgs bind input
+ jvgs bind input ${TINYXML_LIBRARIES}
)
diff --git a/src/core/PropertyMap.cpp b/src/core/PropertyMap.cpp
index 190b317..3f7dd1a 100644
--- a/src/core/PropertyMap.cpp
+++ b/src/core/PropertyMap.cpp
@@ -1,7 +1,7 @@
#include "PropertyMap.h"
#include "LogManager.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace std;
namespace jvgs
diff --git a/src/core/XMLLoadable.cpp b/src/core/XMLLoadable.cpp
index f5cbc46..b819184 100644
--- a/src/core/XMLLoadable.cpp
+++ b/src/core/XMLLoadable.cpp
@@ -1,7 +1,7 @@
#include "XMLLoadable.h"
#include "LogManager.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace std;
diff --git a/src/game/AbstractCamera.cpp b/src/game/AbstractCamera.cpp
index b349418..725a2e2 100644
--- a/src/game/AbstractCamera.cpp
+++ b/src/game/AbstractCamera.cpp
@@ -5,7 +5,7 @@ using namespace jvgs::video;
using namespace jvgs::math;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
namespace jvgs
{
diff --git a/src/game/Animation.cpp b/src/game/Animation.cpp
index ac563a6..6aa3b10 100644
--- a/src/game/Animation.cpp
+++ b/src/game/Animation.cpp
@@ -7,7 +7,7 @@ using namespace jvgs::sketch;
#include "../core/LogManager.h"
using namespace jvgs::core;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace std;
diff --git a/src/game/BullController.cpp b/src/game/BullController.cpp
index 78f81af..56930b4 100644
--- a/src/game/BullController.cpp
+++ b/src/game/BullController.cpp
@@ -8,7 +8,7 @@ using namespace jvgs::core;
#include "../math/Vector2D.h"
using namespace jvgs::math;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace std;
diff --git a/src/game/CollisionResponsePositioner.cpp b/src/game/CollisionResponsePositioner.cpp
index 8065efe..657c1c6 100644
--- a/src/game/CollisionResponsePositioner.cpp
+++ b/src/game/CollisionResponsePositioner.cpp
@@ -15,7 +15,7 @@ using namespace jvgs::sketch;
#include "../math/QuadTree.h"
using namespace jvgs::math;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
#include <iostream>
using namespace std;
diff --git a/src/game/DefaultInputController.cpp b/src/game/DefaultInputController.cpp
index a05aec9..c6da502 100644
--- a/src/game/DefaultInputController.cpp
+++ b/src/game/DefaultInputController.cpp
@@ -7,7 +7,7 @@
#include "../input/InputManager.h"
using namespace jvgs::input;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace jvgs::math;
diff --git a/src/game/Entity.cpp b/src/game/Entity.cpp
index 914297f..f353541 100644
--- a/src/game/Entity.cpp
+++ b/src/game/Entity.cpp
@@ -27,7 +27,7 @@ using namespace jvgs::video;
#include "../bind/ScriptManager.h"
using namespace jvgs::bind;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace std;
using namespace jvgs::math;
diff --git a/src/game/FlyStraightController.cpp b/src/game/FlyStraightController.cpp
index 1217b62..62f8c1a 100644
--- a/src/game/FlyStraightController.cpp
+++ b/src/game/FlyStraightController.cpp
@@ -5,7 +5,7 @@
#include "../math/Vector2D.h"
using namespace jvgs::math;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
namespace jvgs
{
diff --git a/src/game/FollowCamera.cpp b/src/game/FollowCamera.cpp
index 4a1006b..4b1fe2c 100644
--- a/src/game/FollowCamera.cpp
+++ b/src/game/FollowCamera.cpp
@@ -12,7 +12,7 @@ using namespace jvgs::video;
using namespace jvgs::math;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
namespace jvgs
{
diff --git a/src/game/InputController.cpp b/src/game/InputController.cpp
index 0d76dd7..1e07609 100644
--- a/src/game/InputController.cpp
+++ b/src/game/InputController.cpp
@@ -5,7 +5,7 @@
#include "../input/InputManager.h"
using namespace jvgs::input;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace jvgs::math;
diff --git a/src/game/Level.cpp b/src/game/Level.cpp
index a02e818..bf0c485 100644
--- a/src/game/Level.cpp
+++ b/src/game/Level.cpp
@@ -14,7 +14,7 @@ using namespace jvgs::video;
#include "../audio/AudioManager.h"
using namespace jvgs::audio;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace jvgs::sketch;
using namespace jvgs::math;
diff --git a/src/game/PatrollingController.cpp b/src/game/PatrollingController.cpp
index 74e5171..7d56754 100644
--- a/src/game/PatrollingController.cpp
+++ b/src/game/PatrollingController.cpp
@@ -5,7 +5,7 @@
#include "../math/MathManager.h"
using namespace jvgs::math;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
namespace jvgs
{
diff --git a/src/game/Positioner.cpp b/src/game/Positioner.cpp
index 6297c09..5fb2f37 100644
--- a/src/game/Positioner.cpp
+++ b/src/game/Positioner.cpp
@@ -1,7 +1,7 @@
#include "Positioner.h"
#include "Entity.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace jvgs::math;
diff --git a/src/game/SillyController.cpp b/src/game/SillyController.cpp
index 25070e5..4954091 100644
--- a/src/game/SillyController.cpp
+++ b/src/game/SillyController.cpp
@@ -1,7 +1,7 @@
#include "SillyController.h"
#include "Entity.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace jvgs::math;
diff --git a/src/game/SimpleBirdController.cpp b/src/game/SimpleBirdController.cpp
index 54b95bc..82f371f 100644
--- a/src/game/SimpleBirdController.cpp
+++ b/src/game/SimpleBirdController.cpp
@@ -1,7 +1,7 @@
#include "SimpleBirdController.h"
#include "Entity.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace std;
using namespace jvgs::math;
diff --git a/src/game/SimpleCamera.cpp b/src/game/SimpleCamera.cpp
index 00deb92..e640481 100644
--- a/src/game/SimpleCamera.cpp
+++ b/src/game/SimpleCamera.cpp
@@ -2,7 +2,7 @@
using namespace jvgs::math;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
namespace jvgs
{
diff --git a/src/game/Sprite.cpp b/src/game/Sprite.cpp
index 19caa35..ee314df 100644
--- a/src/game/Sprite.cpp
+++ b/src/game/Sprite.cpp
@@ -1,7 +1,7 @@
#include "Sprite.h"
#include "Animation.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
using namespace std;
diff --git a/src/math/Vector2D.cpp b/src/math/Vector2D.cpp
index ba8a05e..61673b3 100644
--- a/src/math/Vector2D.cpp
+++ b/src/math/Vector2D.cpp
@@ -2,7 +2,7 @@
#include <cmath>
#include "MathManager.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
namespace jvgs
{
diff --git a/src/sketch/GroupParser.cpp b/src/sketch/GroupParser.cpp
index 0924f95..58d5584 100644
--- a/src/sketch/GroupParser.cpp
+++ b/src/sketch/GroupParser.cpp
@@ -3,7 +3,7 @@
#include "Group.h"
#include "SketchElement.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
#include "../core/LogManager.h"
using namespace jvgs::core;
diff --git a/src/sketch/Parser.cpp b/src/sketch/Parser.cpp
index 2b55c16..390f9ae 100644
--- a/src/sketch/Parser.cpp
+++ b/src/sketch/Parser.cpp
@@ -13,7 +13,7 @@ using namespace jvgs::core;
#include "../math/Vector2D.h"
using namespace jvgs::math;
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
namespace jvgs
{
diff --git a/src/sketch/PathParser.cpp b/src/sketch/PathParser.cpp
index 1eb2027..eb63cf2 100644
--- a/src/sketch/PathParser.cpp
+++ b/src/sketch/PathParser.cpp
@@ -3,7 +3,7 @@
#include "Path.h"
#include "PathDataParser.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
#include "../core/LogManager.h"
using namespace jvgs::core;
diff --git a/src/sketch/SketchElementParser.cpp b/src/sketch/SketchElementParser.cpp
index b7c4968..fc40dfb 100644
--- a/src/sketch/SketchElementParser.cpp
+++ b/src/sketch/SketchElementParser.cpp
@@ -3,7 +3,7 @@
#include "SketchElement.h"
#include "Parser.h"
-#include "../tinyxml/tinyxml.h"
+#include "tinyxml.h"
#include "../core/LogManager.h"
using namespace jvgs::core;
|
