* Win32 fix: The OS symbol is called "Win32", not "Windows"

packages/extra/opengl/gl.pp

@@ -45,7 +45,7 @@ Abstract:
 
 {$MACRO ON}
 {$MODE Delphi}
-{$IFDEF Windows}
+{$IFDEF Win32}
   {$DEFINE extdecl := stdcall}
 {$ELSE}
   {$DEFINE extdecl := cdecl}
@@ -1498,7 +1498,7 @@ var
   glVertex4sv: procedure(const v: PGLshort); extdecl;
   glVertexPointer: procedure(size: GLint; atype: GLenum; stride: GLsizei; const pointer: Pointer); extdecl;
   glViewport: procedure(x, y: GLint; width, height: GLsizei); extdecl;
-  {$IFDEF Windows}
+  {$IFDEF Win32}
   ChoosePixelFormat: function(DC: HDC; p2: PPixelFormatDescriptor): Integer; extdecl;
   {$ENDIF}
 
@@ -1878,7 +1878,7 @@ begin
   @glVertex4sv := nil;
   @glVertexPointer := nil;
   @glViewport := nil;
-  {$IFDEF Windows}
+  {$IFDEF Win32}
   @ChoosePixelFormat := nil;
   {$ENDIF}
 
@@ -2231,7 +2231,7 @@ begin
   @glVertexPointer := GetProcAddress(LibGL, 'glVertexPointer');
   @glViewport := GetProcAddress(LibGL, 'glViewport');
 
-  {$IFDEF Windows}
+  {$IFDEF Win32}
   @ChoosePixelFormat := GetProcAddress(LibGL, 'ChoosePixelFormat');
   if not Assigned(ChoosePixelFormat) then
     @ChoosePixelFormat := @Windows.ChoosePixelFormat;
@@ -2246,7 +2246,7 @@ initialization
   {$ENDIF}
 
   try
-    {$IFDEF Windows}
+    {$IFDEF Win32}
     LoadOpenGL('opengl32.dll');
     {$ELSE}
     LoadOpenGL('libGL.so.1');

packages/extra/opengl/glext.pp

@@ -8,7 +8,7 @@
 
 {$MACRO ON}
 {$MODE Delphi}
-{$IFDEF Windows}
+{$IFDEF Win32}
   {$DEFINE extdecl:=stdcall }
 {$ELSE}
   {$DEFINE extdecl:=cdecl }
@@ -91,7 +91,7 @@ interface
 
 uses
   SysUtils,
-  {$IFDEF Windows}
+  {$IFDEF Win32}
   Windows,
   {$ELSE}
   DLLFuncs,
@@ -100,7 +100,7 @@ uses
 
 {******************************************************************************}
 
-{$IFDEF Windows}
+{$IFDEF Win32}
 // Not declared in Windows.pas.
 function wglGetProcAddress(proc: PChar): Pointer; extdecl; external 'OpenGL32.dll';
 {$ELSE}
@@ -2071,7 +2071,7 @@ const
 var
   glFlushVertexArrayRangeNV: procedure; extdecl;
   glVertexArrayRangeNV: procedure(size: GLsizei; const ptr: Pointer); extdecl;
-  {$IFDEF Windows}
+  {$IFDEF Win32}
   wglAllocateMemoryNV: function(size: GLsizei; readFrequency, writeFrequency,
 				priority: Single): Pointer; extdecl;
   wglFreeMemoryNV: procedure(ptr: Pointer); extdecl;
@@ -3519,7 +3519,7 @@ const
   GL_TEXTURE_FLOAT_COMPONENTS_NV    = $888C;
   GL_FLOAT_CLEAR_COLOR_VALUE_NV     = $888D;
   GL_FLOAT_RGBA_MODE_NV             = $888E;
-  {$IFDEF Windows}
+  {$IFDEF Win32}
   WGL_FLOAT_COMPONENTS_NV           = $20B0;
   WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV = $20B1;
   WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV = $20B2;
@@ -3571,7 +3571,7 @@ const
 
 {******************************************************************************}
 
-{$IFDEF Windows}
+{$IFDEF Win32}
 //*** WGL_ARB_buffer_region
 const
   WGL_FRONT_COLOR_BUFFER_BIT_ARB    = $00000001;

packages/extra/opengl/glu.pp

@@ -55,7 +55,7 @@ Abstract:
 
 {$MACRO ON}
 {$MODE Delphi}
-{$IFDEF Windows}
+{$IFDEF Win32}
   {$DEFINE extdecl := stdcall}
 {$ELSE}
   {$DEFINE extdecl := cdecl}
@@ -67,7 +67,7 @@ interface
 
 uses
   SysUtils,
-  {$IFDEF Windows}
+  {$IFDEF Win32}
   Windows,
   {$ELSE}
   DLLFuncs,
@@ -499,7 +499,7 @@ end;
 initialization
 
   try
-    {$IFDEF Windows}
+    {$IFDEF Win32}
     LoadGLu('glu32.dll');
     {$ELSE}
     LoadGLu('libGLU.so.1');
@@ -515,7 +515,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2002-10-13 13:57:31  sg
+  Revision 1.2  2002-10-13 14:36:47  sg
+  * Win32 fix: The OS symbol is called "Win32", not "Windows"
+
+  Revision 1.1  2002/10/13 13:57:31  sg
   * Finally, the new units are available: Match the C headers more closely;
     support for OpenGL extensions, and much more. Based on the Delphi units
     by Tom Nuydens of delphi3d.net

packages/extra/opengl/glut.pp

@@ -8,7 +8,7 @@
 
 {$MACRO ON}
 {$MODE Delphi}
-{$IFDEF Windows}
+{$IFDEF Win32}
   {$DEFINE extdecl := stdcall}
 {$ELSE}
   {$DEFINE extdecl := cdecl}
@@ -32,7 +32,7 @@ interface
 
 uses
   SysUtils,
-  {$IFDEF Windows}
+  {$IFDEF Win32}
   Windows,
   {$ELSE}
   DLLFuncs,
@@ -633,7 +633,7 @@ end;
 initialization
 
   try
-    {$IFDEF Windows}
+    {$IFDEF Win32}
     LoadGlut('glut32.dll');
     {$ELSE}
     LoadGlut('libglut.so.3');