X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fa_modes.inc;h=9b5d9390f1fadf14f156622520bde230fc91a334;hb=b1aff140c233d46553f36db9c0527d99be1affbd;hp=c9fd4571b336f7d94b085d046a4ee698fd7d49e6;hpb=d63e6eaaecbc83b40c9b932b3381fc324f6a2461;p=d2df-sdl.git diff --git a/src/shared/a_modes.inc b/src/shared/a_modes.inc index c9fd457..9b5d939 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} @@ -112,6 +115,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!} @@ -138,7 +144,11 @@ {$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} {$IF DEFINED(USE_GLSTUB)}