Merge pull request #111 from joolswills/pugixml_update

update pugixml to v1.8.1 / convert to a submodule

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "external/pugixml"]
+	path = external/pugixml
+	url = https://github.com/zeux/pugixml.git

es-app/src/Gamelist.cpp

@@ -1,6 +1,6 @@
 #include "Gamelist.h"
 #include "SystemData.h"
-#include "pugixml/pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 #include <boost/filesystem.hpp>
 #include "Log.h"
 #include "Settings.h"

es-app/src/MetaData.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 #include <string>
 #include <map>
 #include "GuiComponent.h"

es-app/src/scrapers/GamesDBScraper.cpp

@@ -1,6 +1,6 @@
 #include "scrapers/GamesDBScraper.h"
 #include "Log.h"
-#include "pugixml/pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 #include "MetaData.h"
 #include "Settings.h"
 #include "Util.h"

es-core/src/InputConfig.h

@@ -6,7 +6,7 @@
 #include <string>
 #include <SDL.h>
 #include <sstream>
-#include "pugixml/pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 
 #define DEVICE_KEYBOARD -1
 

es-core/src/InputManager.cpp

@@ -3,7 +3,7 @@
 #include "Settings.h"
 #include "Window.h"
 #include "Log.h"
-#include "pugixml/pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 #include <boost/filesystem.hpp>
 #include "platform.h"
 

es-core/src/Settings.cpp

@@ -1,6 +1,6 @@
 #include "Settings.h"
 #include "Log.h"
-#include "pugixml/pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 #include "platform.h"
 #include <boost/filesystem.hpp>
 #include <boost/assign.hpp>

es-core/src/ThemeData.cpp

@@ -5,7 +5,7 @@
 #include "resources/TextureResource.h"
 #include "Log.h"
 #include "Settings.h"
-#include "pugixml/pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 #include <boost/assign.hpp>
 
 #include "components/ImageComponent.h"

es-core/src/ThemeData.h

@@ -9,7 +9,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/variant.hpp>
 #include <Eigen/Dense>
-#include "pugixml/pugixml.hpp"
+#include "pugixml/src/pugixml.hpp"
 #include "GuiComponent.h"
 
 template<typename T>

external/pugixml

@@ -0,0 +1 @@
+Subproject commit d2deb420bc70369faa12785df2b5dd4d390e523d

external/pugixml/CMakeLists.txt

@@ -1,13 +0,0 @@
-project("pugixml")
-
-set(PUGI_HEADERS
-	${CMAKE_CURRENT_SOURCE_DIR}/pugiconfig.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/pugixml.hpp
-)
-
-set(PUGI_SOURCES
-	${CMAKE_CURRENT_SOURCE_DIR}/src/pugixml.cpp
-)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_library(pugixml STATIC ${PUGI_SOURCES} ${PUG_HEADERS})

external/pugixml/pugiconfig.hpp

@@ -1,69 +0,0 @@
-/**
- * pugixml parser - version 1.2
- * --------------------------------------------------------
- * Copyright (C) 2006-2012, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at http://pugixml.org/
- *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
- *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
- */
-
-#ifndef HEADER_PUGICONFIG_HPP
-#define HEADER_PUGICONFIG_HPP
-
-// Uncomment this to enable wchar_t mode
-// #define PUGIXML_WCHAR_MODE
-
-// Uncomment this to disable XPath
-// #define PUGIXML_NO_XPATH
-
-// Uncomment this to disable STL
-// #define PUGIXML_NO_STL
-
-// Uncomment this to disable exceptions
-// #define PUGIXML_NO_EXCEPTIONS
-
-// Set this to control attributes for public classes/functions, i.e.:
-// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
-// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
-// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
-// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
-
-// Uncomment this to switch to header-only version
-// #define PUGIXML_HEADER_ONLY
-// #include "pugixml.cpp"
-
-// Tune these constants to adjust memory-related behavior
-// #define PUGIXML_MEMORY_PAGE_SIZE 32768
-// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
-// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
-
-#endif
-
-/**
- * Copyright (c) 2006-2012 Arseny Kapoulkine
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */

external/pugixml/pugixml_license.txt

@@ -1,27 +0,0 @@
-pugixml 1.2 - an XML processing library
-
-
-This library is distributed under the MIT License:
-
-Copyright (c) 2006-2012 Arseny Kapoulkine
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.