mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-25 06:05:45 +00:00
Code Issues Releases Wiki Activity

More win32 cmake fixes, should now hopefully compile out of the box

Browse source
This commit is contained in:
fgenesis 2013-06-19 18:35:06 +02:00
parent f8bdac10a2
commit 98399f6bc3
2 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
CMakeLists.txt
View file

@ -200,19 +200,19 @@ endif (NOT OPENAL_FOUND)
################ End of external libraries
INCLUDE_DIRECTORIES(${BBGEDIR})
INCLUDE_DIRECTORIES(${BBGEDIR}/GL)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${SRCDIR})
INCLUDE_DIRECTORIES(${FTGLDIR}/include)
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${OGGVORBIS_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${EXTLIBDIR})
INCLUDE_DIRECTORIES(${EXTLIBDIR}/ttvfs)
INCLUDE_DIRECTORIES("${BBGEDIR}")
INCLUDE_DIRECTORIES("${BBGEDIR}/GL")
INCLUDE_DIRECTORIES("${ZLIB_INCLUDE_DIRS}")
INCLUDE_DIRECTORIES("${PNG_INCLUDE_DIR}")
INCLUDE_DIRECTORIES("${SRCDIR}")
INCLUDE_DIRECTORIES("${FTGLDIR}/include")
INCLUDE_DIRECTORIES("${FREETYPE_INCLUDE_DIRS}")
INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}")
INCLUDE_DIRECTORIES("${OGGVORBIS_INCLUDE_DIRS}")
INCLUDE_DIRECTORIES("${SDL_INCLUDE_DIR}")
INCLUDE_DIRECTORIES("${OPENAL_INCLUDE_DIR}")
INCLUDE_DIRECTORIES("${EXTLIBDIR}")
INCLUDE_DIRECTORIES("${EXTLIBDIR}/ttvfs")
# Custom build ID: e.g. "-custom", " (my very own build)"
@ -647,12 +647,15 @@ SET(LUA_SRCS
)
IF(AQUARIA_USE_VFS)
ADD_SUBDIRECTORY(${EXTLIBDIR}/ttvfs)
ADD_SUBDIRECTORY(${EXTLIBDIR}/ttvfs_zip)
ADD_SUBDIRECTORY("${EXTLIBDIR}/ttvfs")
ADD_SUBDIRECTORY("${EXTLIBDIR}/ttvfs_zip")
SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} "ttvfs")
SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} "ttvfs_zip")
ENDIF(AQUARIA_USE_VFS)
IF(WIN32)
SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} "ws2_32")
ENDIF(WIN32)
IF(MACOSX)
SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} "-framework Carbon")

18
ExternalLibs/glfont2/glfont2.cpp
View file

@ -11,15 +11,15 @@
#include "ByteBuffer.h"
using namespace std;
//OpenGL headers
/*
#ifdef _WINDOWS
#include <windows.h>
#endif
#include <OpenGL/gl.h>
*/
#include "GL/gl.h"
#ifdef _WIN32 /* Stupid Windows needs to include windows.h before gl.h */
#undef FAR
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX
#include <windows.h>
#undef GetCharWidth
#endif
#include "gl.h"
//glFont header
#include "glfont2.h"
@ -232,7 +232,7 @@ int GLFont::GetCharWidth (unsigned char c)
if (c == ' ' && glfont_char->dx <= 0)
{
GLFontChar *glfont_a = &header.chars['a' - header.start_char];
glfont_char->dx = glfont_a->dx*0.75;
glfont_char->dx = glfont_a->dx*0.75f;
glfont_char->dy = glfont_a->dy;
}