finally hwengine in c links without errors webgl
authorkoda
Sun, 11 Nov 2012 17:58:36 +0100
branchwebgl
changeset 8032 f8fcece14302
parent 8029 7ba43d7e54e7
child 8035 68ec3138c16d
finally hwengine in c links without errors
hedgewars/uStore.pas
hedgewars/uVariables.pas
--- a/hedgewars/uStore.pas	Sun Nov 11 17:52:49 2012 +0100
+++ b/hedgewars/uStore.pas	Sun Nov 11 17:58:36 2012 +0100
@@ -689,7 +689,9 @@
 
 function glLoadExtension(extension : shortstring) : boolean;
 begin
-{$IF (GLunit = gles11) OR DEFINED(PAS2C)}
+//TODO: pas2c doesn't handle {$IF (GLunit = gles11) OR DEFINED(PAS2C)}
+{$IFNDEF PAS2C}
+{$IF GLunit = gles11}
     // FreePascal doesnt come with OpenGL ES 1.1 Extension headers
     extension:= extension; // avoid hint
     glLoadExtension:= false;
@@ -701,6 +703,7 @@
     else
         AddFileLog('OpenGL - "' + extension + '" failed to load');
 {$ENDIF}
+{$ENDIF}
 end;
 
 procedure SetupOpenGLAttributes;
--- a/hedgewars/uVariables.pas	Sun Nov 11 17:52:49 2012 +0100
+++ b/hedgewars/uVariables.pas	Sun Nov 11 17:58:36 2012 +0100
@@ -2763,8 +2763,8 @@
     LuaTemplateNumber:= 0;
     cStereoDepth := 0;
 
-    MatrixLoadIdentity(mModelview);
-    MatrixLoadIdentity(mProjection);
+//    MatrixLoadIdentity(mModelview);
+//    MatrixLoadIdentity(mProjection);
     aVertex:= 0;
     aTexCoord:= 1;
     aColor:= 2;