mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2024-12-24 13:45:47 +00:00
Revert "Revert "move around some files to keep the size of the next commit down""
This reverts commit b2abcff02d
.
This commit is contained in:
parent
b2abcff02d
commit
d4282221fc
19 changed files with 15 additions and 6510 deletions
|
@ -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 "../ExternalLibs/tinyxml.h"
|
||||
#include "tinyxml.h"
|
||||
#include "../BBGE/Slider.h"
|
||||
#include "../BBGE/DebugFont.h"
|
||||
#include "../BBGE/TTFFont.h"
|
||||
|
|
|
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "AutoMap.h"
|
||||
#include "GridRender.h"
|
||||
|
||||
#include "../ExternalLibs/tinyxml.h"
|
||||
#include "tinyxml.h"
|
||||
|
||||
#define MAX_EATS 8
|
||||
|
||||
|
|
|
@ -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 "../ExternalLibs/tinyxml.h"
|
||||
#include "tinyxml.h"
|
||||
#include "AquariaMenuItem.h"
|
||||
#include "ScriptInterface.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 "../ExternalLibs/tinyxml.h"
|
||||
#include "tinyxml.h"
|
||||
#include "../BBGE/SkeletalSprite.h"
|
||||
|
||||
#include "DSQ.h"
|
||||
|
|
|
@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "../ExternalLibs/tinyxml.h"
|
||||
#include "tinyxml.h"
|
||||
#include "../BBGE/DebugFont.h"
|
||||
#include "../ExternalLibs/glpng.h"
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "Game.h"
|
||||
#include "Avatar.h"
|
||||
#else
|
||||
#include "../ExternalLibs/tinyxml.h"
|
||||
#include "tinyxml.h"
|
||||
#endif
|
||||
|
||||
#ifdef BBGE_BUILD_WINDOWS
|
||||
|
|
|
@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
//#include "DrawText.h"
|
||||
#include "RenderObject.h"
|
||||
|
||||
#include "../ExternalLibs/glfont2/glfont2.h"
|
||||
#include "glfont2.h"
|
||||
|
||||
enum BitmapFontEffect
|
||||
{
|
||||
|
|
|
@ -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 "../ExternalLibs/tinyxml.h"
|
||||
#include "tinyxml.h"
|
||||
#include "Core.h"
|
||||
#include "Particles.h"
|
||||
#include "MathFunctions.h"
|
||||
|
|
6496
BBGE/glext/glext.h
6496
BBGE/glext/glext.h
File diff suppressed because it is too large
Load diff
|
@ -159,9 +159,10 @@ endif (NOT OPENAL_FOUND)
|
|||
|
||||
################ End of external libraries
|
||||
|
||||
INCLUDE_DIRECTORIES(${BBGEDIR})
|
||||
INCLUDE_DIRECTORIES(${BBGEDIR}/GL)
|
||||
INCLUDE_DIRECTORIES(${EXTLIBDIR})
|
||||
INCLUDE_DIRECTORIES(${EXTLIBDIR}/GL)
|
||||
INCLUDE_DIRECTORIES(${EXTLIBDIR}/glpng/zlib)
|
||||
INCLUDE_DIRECTORIES(${BBGEDIR})
|
||||
INCLUDE_DIRECTORIES(${SRCDIR})
|
||||
INCLUDE_DIRECTORIES(${FTGLDIR}/include)
|
||||
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
|
||||
|
@ -373,8 +374,11 @@ 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
|
||||
|
@ -397,9 +401,6 @@ 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.
|
||||
|
|
Loading…
Reference in a new issue