diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc
index 9250c112b625f414bd9a90b0819e26d47e4cdbee..9f7caa47b27a923ccabf38375e260aae619c1254 100644 (file)
--- a/src/shared/a_modes.inc
+++ b/src/shared/a_modes.inc
{$ENDIF}
{$IF DEFINED(USE_GLSTUB)}
{$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)}
{$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)}
{$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 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}
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
-{$IFDEF ENABLE_MENU}
- {$IFDEF DISABLE_RENDER}
- {$FATAL Render driver required for current menu implementation}
- {$ENDIF}
-{$ENDIF}
-
{$IFDEF ENABLE_TOUCH}
{$IFDEF DISABLE_SYSTEM}
{$FATAL System driver required for current touch implementation}
{$IFDEF ENABLE_TOUCH}
{$IFDEF DISABLE_SYSTEM}
{$FATAL System driver required for current touch implementation}