# HG changeset patch # User koda # Date 1255383776 0 # Node ID 6df2e58b6ab27d7193d61daaee5cca788162233b # Parent 10e4b5fc0d93f1c62b04c1598abbf5de46854443 can compile on iphone again diff -r 10e4b5fc0d93 -r 6df2e58b6ab2 hedgewars/uKeys.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} diff -r 10e4b5fc0d93 -r 6df2e58b6ab2 hedgewars/uStore.pas --- 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