* refactored the OpenGL library name ifdef sequence to avoid nested ifdefs

git-svn-id: trunk@41646 -

packages/opengl/src/gl.pp

@@ -2255,27 +2255,19 @@ initialization
   SetExceptionMask([exInvalidOp, exDenormalized, exZeroDivide,exOverflow, exUnderflow, exPrecision]);
   {$endif}
 
-  {$IFDEF Windows}
+  {$if defined(Windows)}
   LoadOpenGL('opengl32.dll');
-  {$ELSE}
-  {$IFDEF OS2}
+  {$elseif defined(OS2)}
   LoadOpenGL('opengl.dll');
-  {$ELSE OS2}
-  {$ifdef darwin}
+  {$elseif defined(darwin)}
   LoadOpenGL('/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib');
-  {$ELSE}
-  {$IFDEF MorphOS}
+  {$elseif defined(MorphOS)}
   InitTinyGLLibrary;
-  {$ELSE}
-  {$ifdef haiku}
+  {$elseif defined(haiku)}
   LoadOpenGL('libGL.so');
   {$else}
   LoadOpenGL('libGL.so.1');
   {$endif}
-  {$ENDIF}
-  {$endif}
-  {$ENDIF OS2}
-  {$ENDIF}
 
 finalization
 

packages/opengl/src/glu.pp

@@ -67,27 +67,19 @@ uses
   GL;
 
 Const
-{$IFDEF Windows}
+{$if defined(Windows)}
   GLU_Lib = 'glu32.dll';
-{$ELSE}
-{$IFDEF OS2}
+{$elseif defined(OS2)}
   GLU_Lib = 'opengl.dll';
-{$ELSE OS2}
-{$ifdef darwin}
+{$elseif defined(darwin)}
   GLU_LIB =  '/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib';
-{$else}
-{$IFDEF haiku}
+{$elseif defined(haiku)}
   GLU_LIB = 'libGLU.so';
-{$ELSE}
-{$ifdef MorphOS}
+{$elseif defined(MorphOS)}
   GLU_LIB = 'tinygl.library';
 {$else}
   GLU_LIB = 'libGLU.so.1';
 {$endif}
-{$ENDIF}
-{$ENDIF}
-{$ENDIF OS2}
-{$endif}
                               
 type
   TViewPortArray = array [0..3] of GLint;

packages/opengl/src/glut.pp

@@ -759,25 +759,19 @@ end;
 
 initialization
 
-  {$IFDEF Windows}
+  {$if defined(Windows)}
   LoadGlut('glut32.dll');
-  {$ELSE}
-  {$IFDEF OS2}
+  {$elseif defined(OS2)}
   LoadGlut('glut.dll');
-  {$ELSE OS2}
-  {$ifdef darwin}
+  {$elseif defined(darwin)}
   LoadGlut('/System/Library/Frameworks/GLUT.framework/GLUT');
-  {$else}
-  {$IFDEF haiku}
+  {$elseif defined(haiku)}
   LoadGlut('libglut.so');
-  {$ELSE}
-  {$IFNDEF MORPHOS}
+  {$elseif defined(MORPHOS)}
+  {nothing}
+  {$else}
   LoadGlut('libglut.so.3');
-  {$ENDIF}
-  {$ENDIF}
   {$endif}
-  {$ENDIF OS2}
-  {$ENDIF}
 
 finalization