From 1a20ff5d5955dcd611a6b8c5df8ab6bc984b7cf8 Mon Sep 17 00:00:00 2001 From: fgenesis Date: Fri, 6 Apr 2012 20:57:26 +0200 Subject: [PATCH] Compile fix for win32/MSVC that creeped up for some reason --- BBGE/Base.h | 2 ++ ExternalLibs/glfont2/glfont2.cpp | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/BBGE/Base.h b/BBGE/Base.h index a0c7140..0cd1cc2 100644 --- a/BBGE/Base.h +++ b/BBGE/Base.h @@ -120,6 +120,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma warning(disable:4189) // UqqqqSEFUL: local variable is initialized but not referenced #endif +#undef GetCharWidth + #include #include diff --git a/ExternalLibs/glfont2/glfont2.cpp b/ExternalLibs/glfont2/glfont2.cpp index 3f34acb..0e497c2 100644 --- a/ExternalLibs/glfont2/glfont2.cpp +++ b/ExternalLibs/glfont2/glfont2.cpp @@ -19,7 +19,6 @@ using namespace std; #endif #include */ -#include "Base.h" #include "SDL_endian.h" @@ -91,10 +90,6 @@ bool GLFont::Create (const char *file_name, int tex, bool loadTexture) header.end_char = read_int(input); input.seekg(4, ios::cur); // skip chars field - std::ostringstream os; - os << "tex_width: " << header.tex_width << " tex_height: " << header.tex_height; - debugLog(os.str()); - //Allocate space for character array num_chars = header.end_char - header.start_char + 1; if ((header.chars = new GLFontChar[num_chars]) == NULL)