X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fshared%2Fa_modes.inc;h=fd1463334de5a7da10f6fb8016aa42d72b9cf164;hb=d4203c92b7d37c1b7b6aff994251035aafa388ca;hp=9250c112b625f414bd9a90b0819e26d47e4cdbee;hpb=fe1782e13a7cf88bbbefdc8191b18271ee858985;p=d2df-sdl.git

diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc
index 9250c11..fd14633 100644
--- a/src/shared/a_modes.inc
+++ b/src/shared/a_modes.inc
@@ -277,45 +277,33 @@
 {$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}
-{$ELSEIF DEFINED(ENABLE_RENDER)}
-  {$DEFINE USE_OPENGL}
-  {.$ERROR Render driver not selected. Use -dUSE_GLSTUB or -dUSE_GLES1 or -dUSE_OPENGL}
-{$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}
-    {$FATAL SDL2 required for current Holmes implementation}
-  {$ENDIF}
-  {$IFNDEF USE_OPENGL}
-    {$FATAL Desktop OpenGL required for current Holmes implementation}
+{$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}
-{$ENDIF}
-
-{$IFDEF ENABLE_MENU}
-  {$IFDEF DISABLE_RENDER}
-    {$FATAL Render driver required for current menu implementation}
+{$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_OPENGL or -dUSE_GLES1}
 {$ENDIF}
 
-{$IFDEF ENABLE_TOUCH}
-  {$IFDEF DISABLE_SYSTEM}
-    {$FATAL System driver required for current touch implementation}
-  {$ENDIF}
+{$IFDEF DISABLE_RENDER}
+  {$UNDEF USE_GLSTUB}
+  {$UNDEF USE_GLES1}
+  {$UNDEF USE_OPENGL}
+  {$UNDEF USE_STUBRENDER}
 {$ENDIF}