Ver código fonte

Fixes for Xcode 4.2 and Lion.

Ivan Safrin 14 anos atrás
pai
commit
d12e6c475a

+ 8 - 6
Core/Contents/Include/PolyShader.h

@@ -67,12 +67,14 @@ namespace Polycode {
 			static const int SIZE_MODE_NORMALIZED = 1;
 			static const int SIZE_MODE_NORMALIZED = 1;
 	};
 	};
 	
 	
-	typedef struct {
-		String name;
-		void *data;		
-	} LocalShaderParam;	
+	class LocalShaderParam {
+		public:	
+			String name;
+			void *data;		
+	};	
 	
 	
-	typedef struct {
+	class RenderTargetBinding {
+		public:
 			String id;
 			String id;
 			String name;
 			String name;
 			int mode;
 			int mode;
@@ -81,7 +83,7 @@ namespace Polycode {
 			Number height;			
 			Number height;			
 			static const int MODE_IN= 0;
 			static const int MODE_IN= 0;
 			static const int MODE_OUT = 1;
 			static const int MODE_OUT = 1;
-	} RenderTargetBinding;
+	};
 
 
 	class _PolyExport ShaderBinding {
 	class _PolyExport ShaderBinding {
 		public:
 		public:

+ 2 - 2
Core/Contents/Source/PolyCocoaCore.mm

@@ -123,7 +123,7 @@ CocoaCore::CocoaCore(PolycodeView *view, int xRes, int yRes, bool fullScreen, bo
 	} else {
 	} else {
 		[view clearGLContext];
 		[view clearGLContext];
 		[view setOpenGLContext:context];	
 		[view setOpenGLContext:context];	
-		[context setView: view];					
+		[context setView: (NSView*)view];					
 	}
 	}
 	
 	
 	if(fullScreen) {
 	if(fullScreen) {
@@ -309,7 +309,7 @@ void CocoaCore::setCursor(int cursorType) {
 	}
 	}
 	[glView setCurrentCursor:newCursor];
 	[glView setCurrentCursor:newCursor];
 	[glView resetCursorRects];	
 	[glView resetCursorRects];	
-	[[glView window] invalidateCursorRectsForView: glView];
+	[[glView window] invalidateCursorRectsForView: (NSView*)glView];
 }
 }
 
 
 void CocoaCore::checkEvents() {
 void CocoaCore::checkEvents() {