X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=69cf03426e052d182a4c420038dc5eee71d30a8f;hb=51374402c2585a179840350b3db9681c418c3e6f;hp=7934ed1d97d51ae066cb963c295423364cd71a75;hpb=8b7a40b1a145f53e80098e0faf139c942d2509e5;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 7934ed1..69cf034 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -14,6 +14,7 @@
  *)
 {$INCLUDE ../shared/a_modes.inc}
 {$IFDEF ANDROID}library{$ELSE}program{$ENDIF} Doom2DF;
+
 {$IFNDEF HEADLESS}
   {$IFDEF WINDOWS}
     {$APPTYPE GUI}
@@ -21,42 +22,6 @@
 {$ENDIF}
 {$HINTS OFF}
 
-{$IF DEFINED(USE_SYSSTUB)}
-  {$IF DEFINED(USE_SDL) OR DEFINED(USE_SDL2)}
-    {$ERROR Only one system driver must be selected!}
-  {$ENDIF}
-{$ELSEIF DEFINED(USE_SDL)}
-  {$IF DEFINED(USE_SYSSTUB) OR DEFINED(USE_SDL2)}
-    {$ERROR Only one system driver must be selected!}
-  {$ENDIF}
-{$ELSEIF DEFINED(USE_SDL2)}
-  {$IF DEFINED(USE_SYSSTUB) OR DEFINED(USE_SDL)}
-    {$ERROR Only one system driver must be selected!}
-  {$ENDIF}
-{$ELSE}
-  {$ERROR System driver not selected. Use -dUSE_SYSSTUB or -dUSE_SDL or -dUSE_SDL2}
-{$ENDIF}
-
-{$IF DEFINED(USE_SOUNDSTUB)}
-  {$IF DEFINED(USE_SDLMIXER) OR DEFINED(USE_FMOD) OR DEFINED(USE_OPENAL)}
-    {$ERROR Only one sound driver must be selected!}
-  {$ENDIF}
-{$ELSEIF DEFINED(USE_SDLMIXER)}
-  {$IF DEFINED(USE_SOUNDSTUB) OR DEFINED(USE_FMOD) OR DEFINED(USE_OPENAL)}
-    {$ERROR Only one sound driver must be selected!}
-  {$ENDIF}
-{$ELSEIF DEFINED(USE_FMOD)}
-  {$IF DEFINED(USE_SOUNDSTUB) OR DEFINED(USE_SDLMIXER) OR DEFINED(USE_OPENAL)}
-    {$ERROR Only one sound driver must be selected!}
-  {$ENDIF}
-{$ELSEIF DEFINED(USE_OPENAL)}
-  {$IF DEFINED(USE_SOUNDSTUB) OR DEFINED(USE_SDLMIXER) OR DEFINED(USE_FMOD)}
-    {$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}
-{$ENDIF}
-
 uses
 {$IFDEF ANDROID}
   ctypes,
@@ -77,6 +42,9 @@ uses
 
 {$IFDEF USE_SDL}
   SDL,
+  {$IFDEF USE_SDLMIXER}
+    SDL_mixer,
+  {$ENDIF}
 {$ENDIF}
 {$IFDEF USE_SDL2}
   SDL2 in '../lib/sdl2/sdl2.pas',
@@ -84,6 +52,12 @@ uses
     SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
   {$ENDIF}
 {$ENDIF}
+{$IFDEF USE_SYSSTUB}
+  {$IFDEF USE_SDLMIXER}
+    SDL2 in '../lib/sdl2/sdl2.pas',
+    SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
+  {$ENDIF}
+{$ENDIF}
 
 {$IFDEF USE_OPENAL}
   AL in '../lib/openal/al.pas',
@@ -174,7 +148,6 @@ uses
   g_touch in 'sdl2/g_touch.pas',
 {$ENDIF}
 
-  SysUtils,
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
   fmoderrors in '../lib/FMOD/fmoderrors.pas',
@@ -207,10 +180,8 @@ uses
   fui_flexlay in '../flexui/fui_flexlay.pas',
   fui_ctls in '../flexui/fui_ctls.pas',
 {$ENDIF}
-
-  ImagingTypes,
-  Imaging,
-  ImagingUtility;
+  {$I ../shared/vampimg.inc}
+  SysUtils;
 
 {$IFDEF WINDOWS}
   {$R *.res}