diff --git a/JGE/include/DebugRoutines.h b/JGE/include/DebugRoutines.h index 60459d9c5..666ef4097 100644 --- a/JGE/include/DebugRoutines.h +++ b/JGE/include/DebugRoutines.h @@ -17,7 +17,7 @@ template std::string ToHex(T* pointer) { std::ostringstream stream; - stream << hex << showbase << setfill('0') << setw(8) << (int) pointer; + stream << hex << showbase << setfill('0') << setw(8) << (uint64_t) pointer; return stream.str(); } @@ -29,7 +29,7 @@ std::string ToHex(T* pointer) { \ std::ostringstream stream; \ stream << inString << std::endl; \ - OutputDebugString(stream.str().c_str()); \ + OutputDebugString(stream.str().c_str()); \ } #else #define DebugTrace(inString) \ diff --git a/JGE/src/JMD2Model.cpp b/JGE/src/JMD2Model.cpp index 3d6db171a..50fe14f2c 100644 --- a/JGE/src/JMD2Model.cpp +++ b/JGE/src/JMD2Model.cpp @@ -7,6 +7,7 @@ // Copyright (c) 2007 James Hui (a.k.a. Dr.Watson) // //------------------------------------------------------------------------------------- +#undef GL_VERSION_2_0 #include "../include/JFileSystem.h" #include "../include/JRenderer.h" diff --git a/projects/mtg/include/WResourceManager.h b/projects/mtg/include/WResourceManager.h index 4348c40c1..d0c40ee09 100644 --- a/projects/mtg/include/WResourceManager.h +++ b/projects/mtg/include/WResourceManager.h @@ -8,7 +8,7 @@ #include "utils.h" #include "WCachedResource.h" #include "WFont.h" - +#include "JLogger.h" #include #include "Threading.h"