Bill Robinson 12 лет назад
Родитель
Сommit
a46463fce5
2 измененных файлов с 5 добавлено и 1 удалено
  1. 4 0
      Core/Contents/Include/PolyGlobals.h
  2. 1 1
      Core/Contents/Source/PolyWinCore.cpp

+ 4 - 0
Core/Contents/Include/PolyGlobals.h

@@ -40,10 +40,14 @@ THE SOFTWARE.
 	#pragma warning(disable:4018)
 	#pragma warning(disable:4018)
 	#pragma warning(disable:4996)
 	#pragma warning(disable:4996)
 	#pragma warning(disable:4309)
 	#pragma warning(disable:4309)
+	#ifndef NULL
 	#define NULL 0
 	#define NULL 0
+	#endif
 	// Prevent windows.h includes from generating min/max macros that
 	// Prevent windows.h includes from generating min/max macros that
 	// clash with the templates in <algorithm>
 	// clash with the templates in <algorithm>
+    #ifndef NOMINMAX
 	#define NOMINMAX
 	#define NOMINMAX
+    #endif
 
 
 
 
 #endif
 #endif

+ 1 - 1
Core/Contents/Source/PolyWinCore.cpp

@@ -168,7 +168,7 @@ void Win32Core::warpCursor(int x, int y) {
 unsigned int Win32Core::getTicks() {
 unsigned int Win32Core::getTicks() {
 	LARGE_INTEGER li;
 	LARGE_INTEGER li;
 	QueryPerformanceCounter(&li);
 	QueryPerformanceCounter(&li);
-	return unsigned int(li.QuadPart / pcFreq);
+	return (unsigned int)(li.QuadPart / pcFreq);
 }
 }
 
 
 void Win32Core::Render() {
 void Win32Core::Render() {