X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fa_modes.inc;h=9f7caa47b27a923ccabf38375e260aae619c1254;hb=f4dd4b6d0fcdfa236212949133d63b7174585b44;hp=42c44dd7c6d0c459b7e20a1aaa2af837c3b7acf5;hpb=9dd658c29584dad15efd3e379fee8f1f86ce2458;p=d2df-sdl.git diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc index 42c44dd..9f7caa4 100644 --- a/src/shared/a_modes.inc +++ b/src/shared/a_modes.inc @@ -277,20 +277,35 @@ {$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}