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

diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc
index 9596f5b..fd14633 100644
--- a/src/shared/a_modes.inc
+++ b/src/shared/a_modes.inc
@@ -140,6 +140,11 @@
     {$UNDEF ENABLE_RENDER}
     {$DEFINE DISABLE_RENDER}
   {$ENDIF}
+  {$IFDEF ENABLE_SYSTEM}
+    {$WARNING System in headless mode has no sense. Disabled.}
+    {$UNDEF ENABLE_SYSTEM}
+    {$DEFINE DISABLE_SYSTEM}
+  {$ENDIF}
 {$ENDIF}
 
 {$IF DEFINED(ENABLE_MENU) AND DEFINED(DISABLE_MENU)}
@@ -219,6 +224,17 @@
   {$ENDIF}
 {$ENDIF}
 
+{$IF DEFINED(ENABLE_SYSTEM) AND DEFINED(DISABLE_SYSTEM)}
+  {$ERROR Select ENABLE_SYSTEM or DISABLE_SYSTEM}
+{$ELSEIF NOT DEFINED(ENABLE_SYSTEM) AND NOT DEFINED(DISABLE_SYSTEM)}
+  // default ENABLE/DISABLE system driver
+  {$IFDEF HEADLESS}
+    {$DEFINE DISABLE_SYSTEM}
+  {$ELSE}
+    {$DEFINE ENABLE_SYSTEM}
+  {$ENDIF}
+{$ENDIF}
+
 {$IF DEFINED(USE_SYSSTUB)}
   {$IF DEFINED(USE_SDL) OR DEFINED(USE_SDL2)}
     {$ERROR Only one system driver must be selected!}
@@ -261,27 +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}
-{$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 ENABLE_HOLMES}
-  {$IFNDEF USE_SDL2}
-    {$ERROR Holmes supported only with SDL2}
-  {$ENDIF}
-  {$IFNDEF USE_OPENGL}
-    {$ERROR Holmes supported only with desktop OpenGL}
-  {$ENDIF}
+{$IFDEF DISABLE_RENDER}
+  {$UNDEF USE_GLSTUB}
+  {$UNDEF USE_GLES1}
+  {$UNDEF USE_OPENGL}
+  {$UNDEF USE_STUBRENDER}
 {$ENDIF}