Merged revisions 7085 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

r7085 (florian)
* a lot of defines changed from win32 to windows, doesn't help for glut though because I didn't find a win64 glut32.dll yet

git-svn-id: branches/fixes_2_2@7098 -

packages/extra/opengl/fpmake.inc

@@ -4,7 +4,7 @@
     {$ELSEIF defined(EXTRAPACKAGES)}
     Directory:='opengl';
     {$ENDIF}
-    OS:=[linux,netbsd,freebsd,openbsd,win32,darwin];
+    OS:=[linux,netbsd,freebsd,openbsd,win32,darwin,win64];
     Dependencies.Add('x11');
     T:=Targets.AddUnit('gl');
     T:=Targets.AddUnit('glu');

packages/extra/opengl/gl.pp

@@ -62,15 +62,15 @@ interface
 
 uses
   SysUtils,
-  {$IFDEF Win32}
+  {$IFDEF Windows}
   Windows, dynlibs
-  {$ELSE Win32}
+  {$ELSE Windows}
   {$IFDEF MorphOS}
   TinyGL
   {$ELSE MorphOS}
   dynlibs
   {$ENDIF MorphOS}
-  {$ENDIF Win32};
+  {$ENDIF Windows};
 
 {$IFNDEF MORPHOS}
 var
@@ -94,7 +94,7 @@ type
   GLclampd   = Double;        PGLclampd   = ^GLclampd;
 { GLvoid     = void; }        PGLvoid     = Pointer;
                               PPGLvoid    = ^PGLvoid;
-                              
+
   TGLenum     = GLenum;
   TGLboolean  = GLboolean;
   TGLbitfield = GLbitfield;
@@ -1531,7 +1531,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 Win32}
+  {$IFDEF Windows}
   ChoosePixelFormat: function(DC: HDC; p2: PPixelFormatDescriptor): Integer; extdecl;
   {$ENDIF}
 {$ENDIF MORPHOS}
@@ -1573,7 +1573,7 @@ procedure FreeOpenGL;
 
 implementation
 
-{$ifdef win32}
+{$ifdef windows}
 function WinChoosePixelFormat(DC: HDC; p2: PPixelFormatDescriptor): Integer; extdecl; external 'gdi32' name 'ChoosePixelFormat';
 {$endif}
 
@@ -1928,7 +1928,7 @@ begin
   @glVertex4sv := nil;
   @glVertexPointer := nil;
   @glViewport := nil;
-  {$IFDEF Win32}
+  {$IFDEF Windows}
   @ChoosePixelFormat := nil;
   {$ENDIF}
 
@@ -2299,7 +2299,7 @@ begin
     raise Exception.Create('Failed loading ' + MethodName +' from ' + dll);
   end;
 
-  {$IFDEF Win32}
+  {$IFDEF Windows}
   try
     @ChoosePixelFormat := GetGLProcAddress(LibGL, 'ChoosePixelFormat');
     if not Assigned(ChoosePixelFormat) then
@@ -2319,7 +2319,7 @@ initialization
   Set8087CW($133F);
   {$endif x86}
 
-  {$IFDEF Win32}
+  {$IFDEF Windows}
   LoadOpenGL('opengl32.dll');
   {$ELSE}
   {$ifdef darwin}

packages/extra/opengl/glext.pp

@@ -34,7 +34,7 @@ uses
   {$ENDIF}
   GL;
 
-{$IFDEF Win32}
+{$IFDEF Windows}
 { Declared in Windows unit as well in FPC; but declared here as well, to be
   fully compatible to upstream version  - sg }
 function wglGetProcAddress(proc: PChar): Pointer; extdecl; external 'OpenGL32.dll';
@@ -495,7 +495,7 @@ function Load_GL_ARB_multisample: Boolean;
 
 function Load_GL_ARB_texture_env_add: Boolean;
 
-{$IFDEF Win32}
+{$IFDEF Windows}
 //***** WGL_ARB_extensions_string *****//
 var
   wglGetExtensionsStringARB: function(hdc: HDC): Pchar; extdecl;
@@ -1917,7 +1917,7 @@ const
 var
   glVertexArrayRangeNV: procedure(length: GLsizei; pointer: PGLvoid); extdecl;
   glFlushVertexArrayRangeNV: procedure(); extdecl;
-{$IFDEF Win32}
+{$IFDEF Windows}
   wglAllocateMemoryNV: function(size: GLsizei; readFrequency: GLfloat; writeFrequency: GLfloat; priority: GLfloat): PGLvoid; extdecl;
   wglFreeMemoryNV: procedure(pointer: PGLvoid); extdecl;
 {$ENDIF}
@@ -2291,7 +2291,7 @@ var
 
 function Load_GL_ATI_vertex_streams: Boolean;
 
-{$IFDEF Win32}
+{$IFDEF Windows}
 //***** WGL_I3D_image_buffer *****//
 const
   WGL_IMAGE_BUFFER_MIN_ACCESS_I3D = $0001;
@@ -2864,7 +2864,7 @@ var
 
 function Load_GL_APPLE_vertex_array_range: Boolean;
 
-{$IFDEF Win32}
+{$IFDEF Windows}
 //***** WGL_ARB_pixel_format *****//
 const
   WGL_NUMBER_PIXEL_FORMATS_ARB = $2000;
@@ -3194,7 +3194,7 @@ const
   GL_TEXTURE_FLOAT_COMPONENTS_NV = $888C;
   GL_FLOAT_CLEAR_COLOR_VALUE_NV = $888D;
   GL_FLOAT_RGBA_MODE_NV = $888E;
-{$IFDEF Win32}
+{$IFDEF Windows}
   WGL_FLOAT_COMPONENTS_NV = $20B0;
   WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV = $20B1;
   WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV = $20B2;
@@ -3244,7 +3244,7 @@ function Load_GL_NV_primitive_restart: Boolean;
 
 function Load_GL_NV_vertex_program2: Boolean;
 
-{$IFDEF WIN32}
+{$IFDEF Windows}
 //***** WGL_NV_render_texture_rectangle *****//
 const
   WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV = $20A0;
@@ -3312,7 +3312,7 @@ var
 
 function Load_GL_ATI_draw_buffers: Boolean;
 
-{$IFDEF WIN32}
+{$IFDEF Windows}
 //***** WGL_ATI_pixel_format_float *****//
 const
   WGL_RGBA_FLOAT_MODE_ATI = $8820;
@@ -4242,7 +4242,7 @@ function Load_GL_version_2_0: Boolean;
 
 implementation
 
-{$IFNDEF Win32}
+{$IFNDEF Windows}
 function wglGetProcAddress(proc: PChar): Pointer;
 begin
   Result := GetProcAddress(LibGL, proc);
@@ -4629,7 +4629,7 @@ begin
 
 end;
 
-{$IFDEF Win32}
+{$IFDEF Windows}
 function Load_WGL_ARB_extensions_string: Boolean;
 var
   extstring: String;
@@ -6314,7 +6314,7 @@ begin
     if not Assigned(glVertexArrayRangeNV) then Exit;
     glFlushVertexArrayRangeNV := wglGetProcAddress('glFlushVertexArrayRangeNV');
     if not Assigned(glFlushVertexArrayRangeNV) then Exit;
-{$IFDEF Win32}
+{$IFDEF Windows}
     wglAllocateMemoryNV := wglGetProcAddress('wglAllocateMemoryNV');
     if not Assigned(wglAllocateMemoryNV) then Exit;
     wglFreeMemoryNV := wglGetProcAddress('wglFreeMemoryNV');
@@ -6759,7 +6759,7 @@ begin
 
 end;
 
-{$IFDEF Win32}
+{$IFDEF Windows}
 function Load_WGL_I3D_image_buffer: Boolean;
 var
   extstring: String;
@@ -7619,7 +7619,7 @@ begin
   load_GL_ARB_vertex_buffer_object:=true;
 end;
 
-{$IFDEF Win32}
+{$IFDEF Windows}
 function Load_WGL_ARB_pixel_format: Boolean;
 var
   extstring: String;
@@ -8047,7 +8047,7 @@ begin
 
 end;
 
-{$IFDEF WIN32}
+{$IFDEF Windows}
 function Load_WGL_NV_render_texture_rectangle: Boolean;
 var
   extstring: String;
@@ -8080,7 +8080,7 @@ begin
     if not Assigned(glPixelDataRangeNV) then Exit;
     @glFlushPixelDataRangeNV := wglGetProcAddress('glFlushPixelDataRangeNV');
     if not Assigned(glFlushPixelDataRangeNV) then Exit;
-    {$IFDEF WIN32}
+    {$IFDEF Windows}
     @wglAllocateMemoryNV := wglGetProcAddress('wglAllocateMemoryNV');
     if not Assigned(wglAllocateMemoryNV) then Exit;
     @wglFreeMemoryNV := wglGetProcAddress('wglFreeMemoryNV');
@@ -8138,7 +8138,7 @@ begin
 
 end;
 
-{$IFDEF WIN32}
+{$IFDEF Windows}
 function Load_WGL_ATI_pixel_format_float: Boolean;
 var
   extstring: String;
@@ -9348,7 +9348,7 @@ begin
   else if ext = 'GL_ARB_transpose_matrix' then Result := Load_GL_ARB_transpose_matrix
   else if ext = 'GL_ARB_multisample' then Result := Load_GL_ARB_multisample
   else if ext = 'GL_ARB_texture_env_add' then Result := Load_GL_ARB_texture_env_add
-{$IFDEF Win32}
+{$IFDEF Windows}
   else if ext = 'WGL_ARB_extensions_string' then Result := Load_WGL_ARB_extensions_string
   else if ext = 'WGL_ARB_buffer_region' then Result := Load_WGL_ARB_buffer_region
 {$ENDIF}
@@ -9436,7 +9436,7 @@ begin
   else if ext = 'GL_ATI_texture_mirror_once' then Result := Load_GL_ATI_texture_mirror_once
   else if ext = 'GL_ATI_vertex_array_object' then Result := Load_GL_ATI_vertex_array_object
   else if ext = 'GL_ATI_vertex_streams' then Result := Load_GL_ATI_vertex_streams
-{$IFDEF Win32}
+{$IFDEF Windows}
   else if ext = 'WGL_I3D_image_buffer' then Result := Load_WGL_I3D_image_buffer
   else if ext = 'WGL_I3D_swap_frame_lock' then Result := Load_WGL_I3D_swap_frame_lock
   else if ext = 'WGL_I3D_swap_frame_usage' then Result := Load_WGL_I3D_swap_frame_usage
@@ -9474,7 +9474,7 @@ begin
   else if ext = 'GL_APPLE_fence' then Result := Load_GL_APPLE_fence
   else if ext = 'GL_APPLE_vertex_array_object' then Result := Load_GL_APPLE_vertex_array_object
   else if ext = 'GL_APPLE_vertex_array_range' then Result := Load_GL_APPLE_vertex_array_range
-{$IFDEF Win32}
+{$IFDEF Windows}
   else if ext = 'WGL_ARB_pixel_format' then Result := Load_WGL_ARB_pixel_format
   else if ext = 'WGL_ARB_make_current_read' then Result := Load_WGL_ARB_make_current_read
   else if ext = 'WGL_ARB_pbuffer' then Result := Load_WGL_ARB_pbuffer
@@ -9494,14 +9494,14 @@ begin
   else if ext = 'GL_NV_fragment_program' then Result := Load_GL_NV_fragment_program
   else if ext = 'GL_NV_primitive_restart' then Result := Load_GL_NV_primitive_restart
   else if ext = 'GL_NV_vertex_program2' then Result := Load_GL_NV_vertex_program2
-  {$IFDEF WIN32}
+  {$IFDEF Windows}
   else if ext = 'WGL_NV_render_texture_rectangle' then Result := Load_WGL_NV_render_texture_rectangle
   {$ENDIF}
   else if ext = 'GL_NV_pixel_data_range' then Result := Load_GL_NV_pixel_data_range
   else if ext = 'GL_EXT_texture_rectangle' then Result := Load_GL_EXT_texture_rectangle
   else if ext = 'GL_S3_s3tc' then Result := Load_GL_S3_s3tc
   else if ext = 'GL_ATI_draw_buffers' then Result := Load_GL_ATI_draw_buffers
-  {$IFDEF WIN32}
+  {$IFDEF Windows}
   else if ext = 'WGL_ATI_pixel_format_float' then Result := Load_WGL_ATI_pixel_format_float
   {$ENDIF}
   else if ext = 'GL_ATI_texture_env_combine3' then Result := Load_GL_ATI_texture_env_combine3

packages/extra/opengl/glu.pp

@@ -99,11 +99,11 @@ type
   GLUquadricObj = GLUquadric;           PGLUquadricObj = PGLUquadric;
   GLUtesselatorObj = GLUtesselator;     PGLUtesselatorObj = PGLUtesselator;
   GLUtriangulatorObj = GLUtesselator;   PGLUtriangulatorObj = PGLUtesselator;
-  
+
   TGLUnurbs = GLUnurbs;
   TGLUquadric = GLUquadric;
   TGLUtesselator = GLUtesselator;
-  
+
   TGLUnurbsObj = GLUnurbsObj;
   TGLUquadricObj = GLUquadricObj;
   TGLUtesselatorObj = GLUtesselatorObj;
@@ -478,7 +478,7 @@ end;
 {$ELSE MORPHOS}
 var
   MethodName: string = '';
-  
+
   function GetGLuProcAddress(Lib: PtrInt; ProcName: PChar): Pointer;
   begin
     MethodName:=ProcName;
@@ -553,7 +553,7 @@ end;
 
 initialization
 
-  {$IFDEF Win32}
+  {$IFDEF Windows}
   LoadGLu('glu32.dll');
   {$ELSE}
   {$ifdef darwin}

packages/extra/opengl/glut.pp

@@ -135,7 +135,7 @@ const
   GLUT_NORMAL                     = 0;
   GLUT_OVERLAY                    = 1;
 
-{$ifdef win32}
+{$ifdef Windows}
   // Stroke font constants (use these in GLUT program).
   GLUT_STROKE_ROMAN               = Pointer(0);
   GLUT_STROKE_MONO_ROMAN          = Pointer(1);
@@ -148,7 +148,7 @@ const
   GLUT_BITMAP_HELVETICA_10        = Pointer(6);
   GLUT_BITMAP_HELVETICA_12        = Pointer(7);
   GLUT_BITMAP_HELVETICA_18        = Pointer(8);
-{$else win32}
+{$else Windows}
 var
   // Stroke font constants (use these in GLUT program).
   GLUT_STROKE_ROMAN               : Pointer;
@@ -164,7 +164,7 @@ var
   GLUT_BITMAP_HELVETICA_18        : Pointer;
 
 const
-{$endif win32}
+{$endif Windows}
 
   // glutGet parameters.
   GLUT_WINDOW_X                   = 100;
@@ -735,7 +735,7 @@ begin
     @glutEnterGameMode := GetGLutProcAddress(hDLL, 'glutEnterGameMode');
     @glutLeaveGameMode := GetGLutProcAddress(hDLL, 'glutLeaveGameMode');
     @glutGameModeGet := GetGLutProcAddress(hDLL, 'glutGameModeGet');
-{$ifndef win32}
+{$ifndef Windows}
     GLUT_STROKE_ROMAN := GetGLutProcAddress(hDll, 'glutStrokeRoman');
     GLUT_STROKE_MONO_ROMAN := GetGLutProcAddress(hDll,'glutStrokeMonoRoman');
     GLUT_BITMAP_9_BY_15 := GetGLutProcAddress(hDll, 'glutBitmap9By15');
@@ -745,7 +745,7 @@ begin
     GLUT_BITMAP_HELVETICA_10 := GetGLutProcAddress(hDll, 'glutBitmapHelvetica10');
     GLUT_BITMAP_HELVETICA_12 := GetGLutProcAddress(hDll, 'glutBitmapHelvetica12');
     GLUT_BITMAP_HELVETICA_18 := GetGLutProcAddress(hDll, 'glutBitmapHelvetica18');
-{$endif win32}
+{$endif Windows}
   except
     raise Exception.Create('Could not load ' + MethodName + ' from ' + dll);
   end;
@@ -754,7 +754,7 @@ end;
 
 initialization
 
-  {$IFDEF Win32}
+  {$IFDEF Windows}
   LoadGlut('glut32.dll');
   {$ELSE}
   {$ifdef darwin}