X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fnogl%2FnoGLuses.inc;h=9dcc1b52e9d0b8e77ca7b4832a03216e488725fa;hb=1d24275aa4b72cac9efc1e14ba377307f89d7728;hp=458f546ad9932ddafb94b061af7db8d18d20a59f;hpb=92c7868df227201d6914f9f07c9a29ba0e2863cb;p=d2df-sdl.git

diff --git a/src/nogl/noGLuses.inc b/src/nogl/noGLuses.inc
index 458f546..9dcc1b5 100644
--- a/src/nogl/noGLuses.inc
+++ b/src/nogl/noGLuses.inc
@@ -1,27 +1,21 @@
-{$IFDEF USE_NANOGL}
+{$IF DEFINED(USE_NANOGL) OR DEFINED(USE_NOGL)}
   {$DEFINE USE_GLES1}
-{$ELSE}
-  {$IFDEF USE_NOGL}
-    {$DEFINE USE_GLES1}
-  {$ENDIF}
 {$ENDIF}
 
-{$IFDEF USE_GLES1}
+{$IF DEFINED(USE_GLES1) OR DEFINED(USE_GLSTUB) OR DEFINED(USE_GLALSW)}
   {$IFNDEF USE_NANOGL}
     {$DEFINE USE_NOGL}
   {$ENDIF}
 {$ENDIF}
 
 {$IF DEFINED(USE_NANOGL) and DEFINED(USE_NOGL)}
-  {$WARNING you can use only one OpenGL ES wrapper}
+  {$ERROR you can use only one OpenGL ES wrapper}
 {$ENDIF}
 
-{$IFDEF USE_NANOGL}
+{$IF DEFINED(USE_NANOGL)}
   nanoGL in '../lib/nanogl/nanoGL.pas',
+{$ELSEIF DEFINED(USE_NOGL) }
+  noGL in '../nogl/noGL.pas',
 {$ELSE}
-  {$IFDEF USE_NOGL}
-    noGL in '../nogl/noGL.pas',
-  {$ELSE}
-    GL, GLExt,
-  {$ENDIF}
+  GL, GLExt,
 {$ENDIF}