X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fa_modes.inc;h=3e089bd122cb6c79b650e8fe63abe4cda0acfbb2;hb=aa7e40301df69aa13c00ff2bcdb8e532b06b8053;hp=733abb82e82d58ff9d11777541efe0924870758b;hpb=87c3a28dda4534eec3fde4ef06dc5f324b2c4b3b;p=d2df-sdl.git

diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc
index 733abb8..3e089bd 100644
--- a/src/shared/a_modes.inc
+++ b/src/shared/a_modes.inc
@@ -26,6 +26,9 @@
 {$MODESWITCH TYPEHELPERS+} // Allow the use of type helpers.
 {$MODESWITCH UNICODESTRINGS-}
 
+{$IFDEF DARWIN}
+  {$MODESWITCH OBJECTIVEC1}
+{$ENDIF}
 
 {$ASSERTIONS ON}
 {$BITPACKING OFF}
@@ -92,6 +95,32 @@
     {$UNDEF USE_SDL}
     {$UNDEF USE_SDL2}
   {$ENDIF}
+  {$DEFINE USE_GLSTUB}
+  {$IF DEFINED(USE_GLES1) OR DEFINED(USE_OPENGL)}
+    {$WARNING Render drivers not needed in headless mode. Force stub driver...}
+    {$UNDEF USE_GLES1}
+    {$UNDEF USE_OPENGL}
+  {$ENDIF}
+  {$IFDEF ENABLE_HOLMES}
+    {$WARNING Holmes in headless mode has no sense. Disabled.}
+    {$UNDEF ENABLE_HOLMES}
+  {$ENDIF}
+  {$IFDEF ENABLE_MENU}
+    {$WARNING Menu in headless mode has no sense. Disabled.}
+    {$UNDEF ENABLE_MENU}
+    {$DEFINE DISABLE_MENU}
+  {$ENDIF}
+{$ENDIF}
+
+{$IF DEFINED(ENABLE_MENU) AND DEFINED(DISABLE_MENU)}
+  {$ERROR Select ENABLE_MENU or DISABLE_MENU}
+{$ELSEIF NOT DEFINED(ENABLE_MENU) AND NOT DEFINED(DISABLE_MENU)}
+  // defaut ENABLE/DISABLE menu
+  {$IFDEF HEADLESS}
+    {$DEFINE DISABLE_MENU}
+  {$ELSE}
+    {$DEFINE ENABLE_MENU}
+  {$ENDIF}
 {$ENDIF}
 
 {$IF DEFINED(USE_SYSSTUB)}
@@ -102,6 +131,9 @@
   {$IF DEFINED(USE_SYSSTUB) OR DEFINED(USE_SDL2)}
     {$ERROR Only one system driver must be selected!}
   {$ENDIF}
+  {$IFDEF USE_SDLMIXER}
+    {$ERROR SDL_mixer not supported with SDL 1.2.x}
+  {$ENDIF}
 {$ELSEIF DEFINED(USE_SDL2)}
   {$IF DEFINED(USE_SYSSTUB) OR DEFINED(USE_SDL)}
     {$ERROR Only one system driver must be selected!}
@@ -128,17 +160,35 @@
     {$ERROR Only one sound driver must be selected!}
   {$ENDIF}
 {$ELSE}
-  {$ERROR Sound driver not selected. Use -dUSE_SOUNDSTUB or -dUSE_SDLMIXER or -dUSE_FMOD or -dUSE_OPENAL}
+  {$IFDEF IN_TOOLS}
+    {$DEFINE USE_SOUNDSTUB}
+  {$ELSE}
+    {$ERROR Sound driver not selected. Use -dUSE_SOUNDSTUB or -dUSE_SDLMIXER or -dUSE_FMOD or -dUSE_OPENAL}
+  {$ENDIF}
 {$ENDIF}
 
-{$IFDEF ENABLE_HOLMES}
-  {$IFDEF HEADLESS}
-    {$ERROR Holmes in HEADLESS mode has no sense}
+{$IF DEFINED(USE_GLSTUB)}
+  {$IF DEFINED(USE_GLES1) OR DEFINED(USE_OPENGL)}
+    {$ERROR Only one render driver must be selected!}
+  {$ENDIF}
+{$ELSEIF DEFINED(USE_GLES1)}
+  {$IF DEFINED(USE_GLSTUB) OR DEFINED(USE_OPENGL)}
+    {$ERROR Only one render driver must be selected!}
+  {$ENDIF}
+{$ELSEIF DEFINED(USE_OPENGL)}
+  {$IF DEFINED(USE_GLSTUB) OR DEFINED(USE_GLES1)}
+    {$ERROR Only one render driver must be selected!}
   {$ENDIF}
+{$ELSE}
+  {$DEFINE USE_OPENGL}
+  {.$ERROR Render driver not selected. Use -dUSE_GLSTUB or -dUSE_GLES1 or -dUSE_OPENGL}
+{$ENDIF}
+
+{$IFDEF ENABLE_HOLMES}
   {$IFNDEF USE_SDL2}
     {$ERROR Holmes supported only with SDL2}
   {$ENDIF}
-  {$IFDEF USE_GLES1}
-    {$ERROR Holmes not supported with GLES}
+  {$IFNDEF USE_OPENGL}
+    {$ERROR Holmes supported only with desktop OpenGL}
   {$ENDIF}
 {$ENDIF}