Include tinyxml2, update cmake to use this optionally

Aquaria/DSQ.h

@@ -1624,7 +1624,6 @@ protected:
 	std::vector <AquariaSaveSlot*> saveSlots;
 
 	BitmapText *expText, *moneyText;
-	XMLDocument *xmlDoc;
 
 	void clearMenu(float t = 0.01);
 	std::vector <RenderObject*> menu;

CMakeLists.txt

@@ -224,13 +224,15 @@ endif (NOT OPENAL_FOUND)
 
 ### TinyXML2
 
-OPTION(AQUARIA_INTERNAL_TINYXML2 "Always use included TinyXML2 library" FALSE)
+OPTION(AQUARIA_INTERNAL_TINYXML2 "Always use included TinyXML2 library" ${WIN32_TRUE})
 if(NOT AQUARIA_INTERNAL_TINYXML2)
     find_package(TinyXML2)
 endif(NOT AQUARIA_INTERNAL_TINYXML2)
-if (NOT TINYXML2_FOUND)
-    message(SEND_ERROR "TinyXML2 not found and it hasn't been bundled yet.")
-endif (NOT TINYXML2_FOUND)
+if (AQUARIA_INTERNAL_TINYXML2 OR NOT TINYXML2_FOUND)
+    message(STATUS "Using internal copy of TinyXML2")
+    set(TINYXML2_INCLUDE_DIR "${EXTLIBDIR}")
+    set(TINYXML2_SRCS "${EXTLIBDIR}/tinyxml2.cpp")
+endif (AQUARIA_INTERNAL_TINYXML2 OR NOT TINYXML2_FOUND)
 
 ################ End of external libraries
 
@@ -751,7 +753,7 @@ ENDIF(OGGVORBIS_FOUND)
 IF(TINYXML2_FOUND)
     SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${TINYXML2_LIBRARIES})
 ELSE(TINYXML2_FOUND)
-#   SET(OPTIONAL_SRCS ${OPTIONAL_SRCS} ${TINYXML2_SRCS})
+   SET(OPTIONAL_SRCS ${OPTIONAL_SRCS} ${TINYXML2_SRCS})
 ENDIF(TINYXML2_FOUND)
 
 ADD_EXECUTABLE(aquaria ${EXETYPE}