Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to have r3450 at least compile on linux 64 bits

Browse Source
This commit is contained in:
Xawotihs
2011-04-19 19:04:12 +00:00
parent 28b84a1305
commit 40958170fa
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/include/DebugRoutines.h
+2 -2
View File
@@ -17,7 +17,7 @@ template <class T>
std::string ToHex(T* pointer) std::string ToHex(T* pointer)
{ {
std::ostringstream stream; 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(); return stream.str();
} }
@@ -29,7 +29,7 @@ std::string ToHex(T* pointer)
{ \ { \
std::ostringstream stream; \ std::ostringstream stream; \
stream << inString << std::endl; \ stream << inString << std::endl; \
OutputDebugString(stream.str().c_str()); \ OutputDebugString(stream.str().c_str()); \
} }
#else #else
#define DebugTrace(inString) \ #define DebugTrace(inString) \
JGE/src/JMD2Model.cpp
+1
View File
@@ -7,6 +7,7 @@
// Copyright (c) 2007 James Hui (a.k.a. Dr.Watson) <jhkhui@gmail.com> // Copyright (c) 2007 James Hui (a.k.a. Dr.Watson) <jhkhui@gmail.com>
// //
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
#undef GL_VERSION_2_0
#include "../include/JFileSystem.h" #include "../include/JFileSystem.h"
#include "../include/JRenderer.h" #include "../include/JRenderer.h"
projects/mtg/include/WResourceManager.h
+1 -1
View File
@@ -8,7 +8,7 @@
#include "utils.h" #include "utils.h"
#include "WCachedResource.h" #include "WCachedResource.h"
#include "WFont.h" #include "WFont.h"
#include "JLogger.h"
#include <sstream> #include <sstream>
#include "Threading.h" #include "Threading.h"