can compile on iphone again
authorkoda
Mon, 12 Oct 2009 21:42:56 +0000
changeset 2438 6df2e58b6ab2
parent 2437 10e4b5fc0d93
child 2439 a1720b062b9c
can compile on iphone again
hedgewars/uKeys.pas
hedgewars/uStore.pas
--- a/hedgewars/uKeys.pas	Mon Oct 12 21:29:28 2009 +0000
+++ b/hedgewars/uKeys.pas	Mon Oct 12 21:42:56 2009 +0000
@@ -240,7 +240,7 @@
     end;
 
 {$IFDEF SDL13}
-PByteArray(SDL_GetKeyboardState(@i);
+PByteArray(SDL_GetKeyboardState(@i));
 {$ELSE}
 SDL_GetKeyState(@i);
 {$ENDIF}
--- a/hedgewars/uStore.pas	Mon Oct 12 21:29:28 2009 +0000
+++ b/hedgewars/uStore.pas	Mon Oct 12 21:42:56 2009 +0000
@@ -970,7 +970,11 @@
 
 function glLoadExtension(extension : string) : boolean;
 begin
+{$IFNDEF IPHONEOS}
 	glLoadExtension:= glext_LoadExtension(extension);
+{$ELSE}
+        glLoadExtension:= false;
+{$ENDIF}
 	if not glLoadExtension then
 		WriteLnToConsole('OpenGL: "' + extension + '" failed to load')
 	else
@@ -984,7 +988,7 @@
 AddFileLog('GL_MAX_TEXTURE_SIZE: ' + inttostr(MaxTextureSize));
 {$ENDIF}
 
-{$IFNDEF GLES11}
+{$IFNDEF IPHONEOS}
 SupportNPOTT:= glLoadExtension('GL_ARB_texture_non_power_of_two');
 {$ENDIF}
 
@@ -1004,7 +1008,7 @@
 
 procedure SetScale(f: GLfloat);
 begin
-// leave immediately if scale factor didn't change
+// leave immediately if scale factor did not change
 if f = cScaleFactor then exit;
 
 if f = 2.0 then // default scaling