diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc
index 42c44dd7c6d0c459b7e20a1aaa2af837c3b7acf5..831214ab4c1e47f7916b14e96799c84ea794db11 100644 (file)
--- a/src/shared/a_modes.inc
+++ b/src/shared/a_modes.inc
{$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(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}
{$IFNDEF USE_SDL2}
{$FATAL SDL2 required for current Holmes implementation}
{$ENDIF}
- {$IFNDEF USE_OPENGL}
+ {$IF NOT DEFINED(USE_OPENGL) AND NOT DEFINED(USE_NEWGL)}
{$FATAL Desktop OpenGL required for current Holmes implementation}
{$ENDIF}
{$ENDIF}