* merged

packages/opengl/build/gl_w32d.tem

@@ -234,7 +234,7 @@ var
 function GetProc(handle: HInstance; name: PChar): Pointer;
 begin
   Result := GetProcAddress(handle, name);
-  if (Result = nil) and GLUDumpUnresolvedFunctions then
+  if (Result = nil) and GLDumpUnresolvedFunctions then
     WriteLn('Unresolved: ', name);
 end;
 
@@ -288,7 +288,13 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:45  peter
+  Revision 1.2  2000-09-03 22:17:17  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:15:06  peter
+    * typo fix
+
+  Revision 1.1  2000/09/03 21:25:45  peter
     * new updated version
     * gtkglarea unit and demo
     * win32 opengl headers

packages/opengl/build/glut_w32d.tem

@@ -45,7 +45,7 @@ var
 function GetProc(handle: HInstance; name: PChar): Pointer;
 begin
   Result := GetProcAddress(handle, name);
-  if (Result = nil) and GLUDumpUnresolvedFunctions then
+  if (Result = nil) and GLUTDumpUnresolvedFunctions then
     WriteLn('Unresolved: ', name);
 end;
 

packages/opengl/examples/glutdemo.pp

@@ -10,6 +10,15 @@
 {$MODE objfpc}
 {$H+}
 
+{$MACRO ON}
+
+{$ifdef win32}
+  {$define extdecl := stdcall;}
+{$endif}
+{$ifdef linux}
+  {$define extdecl := cdecl;}
+{$endif}
+
 program GLUTDemo;
 uses
   GL, GLU,GLUT;
@@ -60,7 +69,7 @@ begin
 end;
 
 
-procedure DisplayWindow; cdecl;
+procedure DisplayWindow; extdecl
 var
   x, y: Integer;
 begin
@@ -94,7 +103,7 @@ begin
   glutSwapBuffers;
 end;
 
-procedure OnTimer(value: Integer); cdecl;
+procedure OnTimer(value: Integer); extdecl
 begin
   glutPostRedisplay;
   glutTimerFunc(20, @OnTimer, 0);

packages/opengl/examples/morph3d.pp

@@ -36,6 +36,15 @@ program morph3d;
 {$Mode objfpc}
 {$INLINE ON}
 
+{$MACRO ON}
+
+{$ifdef win32}
+  {$define extdecl := stdcall;}
+{$endif}
+{$ifdef linux}
+  {$define extdecl := cdecl;}
+{$endif}
+
 {
 This document is VERY incomplete, but tries to describe the mathematics used
 in the program. At this moment it just describes how the polyhedra are
@@ -134,7 +143,7 @@ So the angle is:
 }
 
 uses
-  GL,GLU,GLUT;
+  GL,GLUT;
 
 type
   float = single;
@@ -700,7 +709,7 @@ begin
 end;
 
 
-procedure do_draw;cdecl;
+procedure do_draw;extdecl
 begin
   glClear( GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT );
 
@@ -727,13 +736,13 @@ begin
 end;
 
 
-procedure do_idle;cdecl;
+procedure do_idle;extdecl
 begin
   glutPostRedisplay();
 end;
 
 
-procedure do_reshape(width,height:longint);cdecl;
+procedure do_reshape(width,height:longint);extdecl
 begin
   WindW:=width;
   WindH:=height;
@@ -843,9 +852,9 @@ begin
 end;
 
 
-procedure do_key(k:char;x,y:integer);cdecl;
+procedure do_key(k:char;x,y:integer);extdecl
 begin
-{  case k of
+  case k of
     '1' : _object:=1;
     '2' : _object:=2;
     '3' : _object:=3;
@@ -855,11 +864,23 @@ begin
     #13 : smooth:=not smooth;
     #27 : halt(0);
   end;
-  pinit;}
+  pinit;
 end;
 
 
 begin
+  if not GLInitialized then
+   begin
+     writeln('OpenGL Not Availble');
+     halt(1);
+   end;
+
+  if not GLUTInitialized then
+   begin
+     writeln('GLUT Not Availble');
+     halt(1);
+   end;
+
   writeln('Morph 3D - Shows morphing platonic polyhedra');
   writeln('Author: Marcelo Fernandes Vianna ([email protected])');
   writeln('  [1]    - Tetrahedron');
@@ -919,7 +940,13 @@ begin
 end.
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:45  peter
+  Revision 1.2  2000-09-03 22:17:17  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:10:47  peter
+    * fixed for win32
+
+  Revision 1.1  2000/09/03 21:25:45  peter
     * new updated version
     * gtkglarea unit and demo
     * win32 opengl headers

packages/opengl/win32/Makefile

@@ -190,7 +190,7 @@ endif
 
 # Targets
 
-override UNITOBJECTS+=gl glut glaux gl_sl glut_sl glaux_sl gtkglarea
+override UNITOBJECTS+=gl glut glaux gl_sl glut_sl glaux_sl
 
 # Clean
 

packages/opengl/win32/Makefile.fpc

@@ -9,7 +9,7 @@ defaulttarget=win32
 packages=gtk
 
 [targets]
-units=gl glut glaux gl_sl glut_sl glaux_sl gtkglarea
+units=gl glut glaux gl_sl glut_sl glaux_sl
 
 [dirs]
 fpcdir=../../..

packages/opengl/win32/gl.pp

@@ -1490,7 +1490,7 @@ var
 function GetProc(handle: HInstance; name: PChar): Pointer;
 begin
   Result := GetProcAddress(handle, name);
-  if (Result = nil) and GLUDumpUnresolvedFunctions then
+  if (Result = nil) and GLDumpUnresolvedFunctions then
     WriteLn('Unresolved: ', name);
 end;
 
@@ -2032,7 +2032,13 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
+  Revision 1.2  2000-09-03 22:17:17  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:40  peter
+    * regenerated
+
+  Revision 1.1  2000/09/03 21:25:45  peter
     * new updated version
     * gtkglarea unit and demo
     * win32 opengl headers
@@ -2049,10 +2055,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:17  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:40  peter
+    * regenerated
 
 }

packages/opengl/win32/gl_sl.pp

@@ -1485,10 +1485,10 @@ END.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:17  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:40  peter
+    * regenerated
 
 }

packages/opengl/win32/glaux.pp

@@ -504,10 +504,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
 }

packages/opengl/win32/glaux_sl.pp

@@ -504,10 +504,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
 }

packages/opengl/win32/glu.pp

@@ -349,11 +349,11 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
   Revision 1.1  2000/07/13 06:34:18  michael
   + Initial import
@@ -366,10 +366,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
 }

packages/opengl/win32/glu_sl.pp

@@ -260,7 +260,13 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
+
+  Revision 1.1  2000/09/03 21:25:45  peter
     * new updated version
     * gtkglarea unit and demo
     * win32 opengl headers
@@ -277,10 +283,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
 }

packages/opengl/win32/glut.pp

@@ -302,7 +302,7 @@ var
 function GetProc(handle: HInstance; name: PChar): Pointer;
 begin
   Result := GetProcAddress(handle, name);
-  if (Result = nil) and GLUDumpUnresolvedFunctions then
+  if (Result = nil) and GLUTDumpUnresolvedFunctions then
     WriteLn('Unresolved: ', name);
 end;
 
@@ -416,10 +416,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
 }

packages/opengl/win32/glut_sl.pp

@@ -312,10 +312,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
 }

packages/opengl/win32/glx.pp

@@ -237,11 +237,11 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
   Revision 1.1  2000/07/13 06:34:18  michael
   + Initial import
@@ -254,10 +254,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
 }

packages/opengl/win32/glx_sl.pp

@@ -166,7 +166,13 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
+
+  Revision 1.1  2000/09/03 21:25:45  peter
     * new updated version
     * gtkglarea unit and demo
     * win32 opengl headers
@@ -183,10 +189,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-09-03 21:25:46  peter
-    * new updated version
-    * gtkglarea unit and demo
-    * win32 opengl headers
-    * morph3d demo
+  Revision 1.2  2000-09-03 22:17:18  peter
+    * merged
+
+  Revision 1.1.2.1  2000/09/03 22:14:41  peter
+    * regenerated
 
 }