X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fa_modes.inc;h=9f7caa47b27a923ccabf38375e260aae619c1254;hb=6dd60afe238e2d7e403568cc286e8f1152b138a0;hp=c500a34f89b2eb6a2ff38a03335ed2734f29c95b;hpb=35f9a0ca016af5ef3dac8dc6ba97dcbf659f6176;p=d2df-sdl.git

diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc
index c500a34..9f7caa4 100644
--- a/src/shared/a_modes.inc
+++ b/src/shared/a_modes.inc
@@ -277,34 +277,49 @@
 {$ENDIF}
 
 {$IF DEFINED(USE_GLSTUB)}
-  {$IF DEFINED(USE_GLES1) OR DEFINED(USE_OPENGL)}
+  {$IF DEFINED(USE_GLES1) OR DEFINED(USE_OPENGL) OR DEFINED(USE_STUBRENDER) OR DEFINED(USE_NEWGL)}
     {$ERROR Only one render driver must be selected!}
   {$ENDIF}
 {$ELSEIF DEFINED(USE_GLES1)}
-  {$IF DEFINED(USE_GLSTUB) OR DEFINED(USE_OPENGL)}
+  {$IF DEFINED(USE_GLSTUB) OR DEFINED(USE_OPENGL) OR DEFINED(USE_STUBRENDER) OR DEFINED(USE_NEWGL)}
     {$ERROR Only one render driver must be selected!}
   {$ENDIF}
 {$ELSEIF DEFINED(USE_OPENGL)}
-  {$IF DEFINED(USE_GLSTUB) OR DEFINED(USE_GLES1)}
+  {$IF DEFINED(USE_GLSTUB) OR DEFINED(USE_GLES1) OR DEFINED(USE_STUBRENDER) OR DEFINED(USE_NEWGL)}
     {$ERROR Only one render driver must be selected!}
   {$ENDIF}
-{$ELSE}
+{$ELSEIF DEFINED(USE_STUBRENDER)}
+  {$IF DEFINED(USE_GLSTUB) OR DEFINED(USE_OPENGL) OR DEFINED(USE_GLES1) OR DEFINED(USE_NEWGL)}
+    {$ERROR Only one render driver must be selected!}
+  {$ENDIF}
+{$ELSEIF DEFINED(USE_NEWGL)}
+  {$IF DEFINED(USE_GLSTUB) OR DEFINED(USE_OPENGL) OR DEFINED(USE_GLES1) OR DEFINED(USE_STUBRENDER)}
+    {$ERROR Only one render driver must be selected!}
+  {$ENDIF}
+{$ELSEIF DEFINED(ENABLE_RENDER)}
   {$DEFINE USE_OPENGL}
-  {.$ERROR Render driver not selected. Use -dUSE_GLSTUB or -dUSE_GLES1 or -dUSE_OPENGL}
+  {.$ERROR Render driver not selected. Use -dUSE_OPENGL or -dUSE_GLES1}
+{$ENDIF}
+
+{$IFDEF DISABLE_RENDER}
+  {$UNDEF USE_GLSTUB}
+  {$UNDEF USE_GLES1}
+  {$UNDEF USE_OPENGL}
+  {$UNDEF USE_STUBRENDER}
 {$ENDIF}
 
 {$IFDEF ENABLE_HOLMES}
+  {$IFDEF DISABLE_SYSTEM}
+    {$FATAL System driver required for current Holmes implementation}
+  {$ENDIF}
+  {$IFDEF DISABLE_RENDER}
+    {$FATAL Render driver required for current Holmes implementation}
+  {$ENDIF}
   {$IFNDEF USE_SDL2}
-    {$ERROR Holmes supported only with SDL2}
+    {$FATAL SDL2 required for current Holmes implementation}
   {$ENDIF}
   {$IFNDEF USE_OPENGL}
-    {$ERROR Holmes supported only with desktop OpenGL}
-  {$ENDIF}
-{$ENDIF}
-
-{$IFDEF ENABLE_MENU}
-  {$IFDEF DISABLE_RENDER}
-    {$FATAL Render driver required for current menu implementation}
+    {$FATAL Desktop OpenGL required for current Holmes implementation}
   {$ENDIF}
 {$ENDIF}