Revert "move around some files to keep the size of the next commit down"

This reverts commit 0951283b31.

Aquaria/AquariaMenuItem.h

@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../BBGE/BitmapFont.h"
 #include "../BBGE/Quad.h"
 #include "../BBGE/ActionMapper.h"
-#include "tinyxml.h"
+#include "../ExternalLibs/tinyxml.h"
 #include "../BBGE/Slider.h"
 #include "../BBGE/DebugFont.h"
 #include "../BBGE/TTFFont.h"

Aquaria/Continuity.cpp

@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "AutoMap.h"
 #include "GridRender.h"
 
-#include "tinyxml.h"
+#include "../ExternalLibs/tinyxml.h"
 
 #define MAX_EATS			8
 

Aquaria/DSQ.h

@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../BBGE/BitmapFont.h"
 #include "../BBGE/ScreenTransition.h"
 #include "../BBGE/Precacher.h"
-#include "tinyxml.h"
+#include "../ExternalLibs/tinyxml.h"
 #include "AquariaMenuItem.h"
 #include "ScriptInterface.h"
 

Aquaria/Entity.h

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../BBGE/DFSprite.h"
 #include "../BBGE/StateMachine.h"
-#include "tinyxml.h"
+#include "../ExternalLibs/tinyxml.h"
 #include "../BBGE/SkeletalSprite.h"
 
 #include "DSQ.h"

Aquaria/Game.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #pragma once
 
-#include "tinyxml.h"
+#include "../ExternalLibs/tinyxml.h"
 #include "../BBGE/DebugFont.h"
 #include "../ExternalLibs/glpng.h"
 

Aquaria/UserSettings.cpp

@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#include "Game.h"
 	#include "Avatar.h"
 #else
-	#include "tinyxml.h"
+	#include "../ExternalLibs/tinyxml.h"
 #endif
 
 #ifdef BBGE_BUILD_WINDOWS

BBGE/BitmapFont.h

@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //#include "DrawText.h"
 #include "RenderObject.h"
 
-#include "glfont2.h"
+#include "../ExternalLibs/glfont2/glfont2.h"
 
 enum BitmapFontEffect
 {

BBGE/SkeletalSprite.cpp

@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #include "SkeletalSprite.h"
-#include "tinyxml.h"
+#include "../ExternalLibs/tinyxml.h"
 #include "Core.h"
 #include "Particles.h"
 #include "MathFunctions.h"

CMakeLists.txt

@@ -159,10 +159,9 @@ endif (NOT OPENAL_FOUND)
 
 ################ End of external libraries
 
-INCLUDE_DIRECTORIES(${EXTLIBDIR})
-INCLUDE_DIRECTORIES(${EXTLIBDIR}/GL)
-INCLUDE_DIRECTORIES(${EXTLIBDIR}/glpng/zlib)
 INCLUDE_DIRECTORIES(${BBGEDIR})
+INCLUDE_DIRECTORIES(${BBGEDIR}/GL)
+INCLUDE_DIRECTORIES(${EXTLIBDIR}/glpng/zlib)
 INCLUDE_DIRECTORIES(${SRCDIR})
 INCLUDE_DIRECTORIES(${FTGLDIR}/include)
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
@@ -374,11 +373,8 @@ SET(BBGE_SRCS
     ${BBGEDIR}/TTFFont.cpp
     ${BBGEDIR}/Vector.cpp
     ${BBGEDIR}/FmodOpenALBridge.cpp
-    ${BBGEDIR}/tinyxml.cpp
-    ${BBGEDIR}/tinyxmlerror.cpp
-    ${BBGEDIR}/tinyxmlparser.cpp
-    ${BBGEDIR}/glfont2.cpp
     ${COCOA_SRCS}
+    ${EXTLIBDIR}/glfont2/glfont2.cpp
     ${EXTLIBDIR}/glpng/glpng.c
     ${EXTLIBDIR}/glpng/png/png.c
     ${EXTLIBDIR}/glpng/png/pngerror.c
@@ -401,6 +397,9 @@ SET(BBGE_SRCS
     ${EXTLIBDIR}/glpng/zlib/trees.c
     ${EXTLIBDIR}/glpng/zlib/uncompr.c
     ${EXTLIBDIR}/glpng/zlib/zutil.c
+    ${EXTLIBDIR}/tinyxml.cpp
+    ${EXTLIBDIR}/tinyxmlerror.cpp
+    ${EXTLIBDIR}/tinyxmlparser.cpp
 )
 
 # Apparently not used at the moment. Listed here just for completeness.