Win32 compile fixes.

Core/Contents/Include/PolyGLCubemap.h

@@ -24,16 +24,20 @@ THE SOFTWARE.
 
 #include "PolyGlobals.h"
 #include "PolyCubemap.h"
+
+#ifdef _WINDOWS
+#include <windows.h>
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #include <OpenGL/glu.h>	
 #else
-#include <GL/gl.h>	
-#include <GL/glu.h>	
+#include <GL/gl.h>
+#include <GL/glext.h>
 #endif
 
-
 namespace Polycode {
 	
 	class Texture;

Core/Contents/Include/PolyGLRenderer.h

@@ -25,6 +25,10 @@ THE SOFTWARE.
 #include "PolyGlobals.h"
 #include "PolyRenderer.h"
 
+#ifdef _WINDOWS
+#include <windows.h>
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>

Core/Contents/Include/PolyGLTexture.h

@@ -24,13 +24,17 @@ THE SOFTWARE.
 #pragma once
 #include "PolyGlobals.h"
 #include "PolyTexture.h"
+
+#ifdef _WINDOWS
+#include <windows.h>
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #include <OpenGL/glu.h>	
 #else
-#include <GL/gl.h>	
-#include <GL/glu.h>	
+#include <GL/gl.h>
 #endif
 
 

Core/Contents/Include/PolyGLVertexBuffer.h

@@ -24,13 +24,17 @@ THE SOFTWARE.
 #pragma once
 #include "PolyMesh.h"
 
+#ifdef _WINDOWS
+#include <windows.h>
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
+#include <GL/glext.h>
 #endif
 
 namespace Polycode {

Core/Contents/Include/PolyWinCore.h

@@ -22,20 +22,16 @@
 
 
 #pragma once
-#include "PolycodeView.h"
 #include "PolyGlobals.h"
 #include "PolyCore.h"
-#include "PolyGLRenderer.h"
-#include "PolyGLSLShaderModule.h"
+#include "PolyInputKeys.h"
+#include "PolyRectangle.h"
+
 #include <windows.h>
 #include <windowsx.h>
 #include <WinUser.h>
-#include "PolyRectangle.h"
-#include <GL/wglext.h>
 
 #include <vector>
-using std::vector;
-
 
 #ifndef VK_0
 #define VK_0	'0'
@@ -148,7 +144,7 @@ namespace Polycode {
 
 		void platformSleep(int msecs);
 
-		vector<Polycode::Rectangle> getVideoModes();
+		std::vector<Polycode::Rectangle> getVideoModes();
 
 		// NEED TO IMPLEMENT:
 
@@ -161,7 +157,7 @@ namespace Polycode {
 		void moveDiskItem(const String& itemPath, const String& destItemPath) {}
 		String openFolderPicker()  { return "";}
 		void removeDiskItem(const String& itemPath)  {}
-		vector<string> openFilePicker(vector<CoreFileExtension> extensions, bool allowMultiple) { vector<string> ret; return ret;}
+		std::vector<String> openFilePicker(std::vector<CoreFileExtension> extensions, bool allowMultiple) { std::vector<String> ret; return ret;}
 		void resizeTo(int xRes, int yRes) { }
 		
 	private:
@@ -170,7 +166,7 @@ namespace Polycode {
 
 		CoreMutex *eventMutex;
 
-		vector<Win32Event> win32Events;
+		std::vector<Win32Event> win32Events;
 
 		void initMultisample(int numSamples);
 

Core/Contents/PolycodeView/MSVC/PolycodeView.cpp

@@ -1,5 +1,9 @@
 
 #include "PolycodeView.h"
+#include "PolyWinCore.h"
+#include "PolyCoreServices.h"
+#include "PolyCoreInput.h"
+#include "PolyRenderer.h"
 
 using namespace Polycode;
 

Core/Contents/PolycodeView/MSVC/PolycodeView.h

@@ -1,8 +1,7 @@
 #pragma once
 
 #include <windows.h>
-#include <Polycode.h>
-#include <PolyWinCore.h>
+#include "PolyCore.h"
 
 using namespace Polycode;
 

Core/Contents/Source/PolyGLCubemap.cpp

@@ -21,7 +21,7 @@
 */
 
 #include "PolyGLCubemap.h"
-#include "PolyTexture.h"
+#include "PolyTexture.h"
 
 using namespace Polycode;
 

Core/Contents/Source/PolyGLRenderer.cpp

@@ -34,10 +34,6 @@
 #include "PolyModule.h"
 #include "PolyPolygon.h"
 
-#ifdef _WINDOWS
-    #include <windows.h>
-#endif
-
 #ifdef _WINDOWS
 
 

Core/Contents/Source/PolyGLSLProgram.cpp

@@ -25,13 +25,16 @@ THE SOFTWARE.
 #include "PolyVector3.h"
 #include "PolyLogger.h"
 
+#ifdef _WINDOWS
+#include <windows.h>
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #include <GL/glext.h>
 #endif
 

Core/Contents/Source/PolyGLSLShader.cpp

@@ -29,6 +29,9 @@ THE SOFTWARE.
 #include "PolyTexture.h"
 #include "PolyCubemap.h"
 
+#ifdef _WINDOWS
+#include <windows.h>
+#endif
 
 #if defined(__APPLE__) && defined(__MACH__)
 #include <OpenGL/gl.h>
@@ -36,7 +39,6 @@ THE SOFTWARE.
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #include <GL/glext.h>
 #ifdef _WINDOWS
 #include <GL/wglext.h>

Core/Contents/Source/PolyGLSLShaderModule.cpp

@@ -33,13 +33,16 @@ THE SOFTWARE.
 
 #include "tinyxml.h"
 
+#ifdef _WINDOWS
+#include <windows.h>
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #include <GL/glext.h>
 #endif
 

Core/Contents/Source/PolyWinCore.cpp

@@ -21,6 +21,17 @@
 */		
 
 #include "PolyWinCore.h"
+#include "PolyCoreInput.h"
+#include "PolyCoreServices.h"
+#include "PolyInputEvent.h"
+#include "PolyGLRenderer.h"
+#include "PolyGLSLShaderModule.h"
+#include "PolyLogger.h"
+#include "PolyThreaded.h"
+
+#include <GL/gl.h>
+#include <GL/glext.h>
+#include <GL/wglext.h>
 
 using namespace Polycode;
 
@@ -526,8 +537,8 @@ CoreMutex *Win32Core::createMutex() {
 	return newMutex;
 }
 		
-vector<Polycode::Rectangle> Win32Core::getVideoModes() {
-	vector<Polycode::Rectangle> retVector;
+std::vector<Polycode::Rectangle> Win32Core::getVideoModes() {
+	std::vector<Polycode::Rectangle> retVector;
 
 	return retVector;
 }