Merge branch 'master' into ci_upload_binaries

Fixed Windows compilation.
2013-12-07 22:08:54 +01:00
parent 38e19f7d35 ee217e94a8
commit cb73e2b90d
41 changed files with 1353 additions and 624 deletions
--- a/JGE/include/DebugRoutines.h
+++ b/JGE/include/DebugRoutines.h
@@ -61,7 +61,7 @@ std::string ToHex(T* pointer)
 {															\
 	std::ostringstream stream;								\
 	stream << inString << std::endl;					    \
-  OutputDebugString(stream.str().c_str());  \
+  OutputDebugStringA(stream.str().c_str());  \
 }
 #endif // QT_CONFIG
 #endif // Win32, Linux