summaryrefslogtreecommitdiff
blob: a55943fc3135c06b0ee8f2fa251ef7d3252ea97c (plain)
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
From: Julian Ospald <hasufell@gentoo.org>
Date: Thu Feb  6 19:58:45 UTC 2014
Subject: use shared tinyxml

--- a/CMakeLists.txt.old.new
+++ b/CMakeLists.txt
@@ -1292,7 +1292,6 @@
 CHECK_INCLUDE_FILE_CXX(getopt.h HAVE_GETOPT_H)
 
 # TinyXML
-add_subdirectory(thirdparty/tinyxml)
 target_link_libraries(openclonk tinyxml)
 
 if(WIN32)
--- a/src/lib/StdMeshLoaderXml.cpp
+++ b/src/lib/StdMeshLoaderXml.cpp
@@ -19,7 +19,7 @@
 #include "C4Include.h"
 #include "StdMesh.h"
 #include "StdMeshLoader.h"
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
 
 // Helper class to load things from an XML file with error checking
 class StdMeshLoader::StdMeshXML