X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=f972e59a650dd8bee91d380ec6895f26a08f16da;hb=76f1664be8570d847e2d848d79b119dec561ce61;hp=3239be1e6fd0bd800cee48c3a34d2d362f708093;hpb=e90ae210fd2bdfd94690ef29bb747e556ab07c40;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 3239be1..f972e59 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -22,13 +22,20 @@
 {$ENDIF}
 {$HINTS OFF}
 
-{$IFDEF USE_SDLMIXER}
- {$IFDEF USE_FMOD}
-  {$ERROR define only one of USE_SDLMIXER or USE_FMOD}
- {$ENDIF}
+{$IF DEFINED(USE_SDLMIXER)}
+  {$IF DEFINED(USE_FMOD) OR DEFINED(USE_OPENAL)}
+    {$ERROR Only one sound driver must be selected!}
+  {$ENDIF}
+{$ELSEIF DEFINED(USE_FMOD)}
+  {$IF DEFINED(USE_SDLMIXER) OR DEFINED(USE_OPENAL)}
+    {$ERROR Only one sound driver must be selected!}
+  {$ENDIF}
+{$ELSEIF DEFINED(USE_OPENAL)}
+  {$IF DEFINED(USE_SDLMIXER) OR DEFINED(USE_FMOD)}
+    {$ERROR Only one sound driver must be selected!}
+  {$ENDIF}
 {$ELSE}
- {$UNDEF USE_SDLMIXER}
- {$DEFINE USE_FMOD}
+  {$ERROR Sound driver not selected. Use -DUSE_SDLMIXER or -DUSE_FMOD or -DUSE_OPENAL}
 {$ENDIF}
 
 uses
@@ -51,6 +58,11 @@ uses
   SDL2 in '../lib/sdl2/sdl2.pas',
 {$IFDEF USE_SDLMIXER}
   SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
+{$ENDIF}
+{$IFDEF USE_OPENAL}
+  AL in '../lib/openal/al.pas',
+  e_soundfile in '../engine/e_soundfile.pas',
+  e_soundfile_wav in '../engine/e_soundfile_wav.pas',
 {$ENDIF}
   ENet in '../lib/enet/enet.pp',
   e_graphics in '../engine/e_graphics.pas',
@@ -172,12 +184,32 @@ begin
   SetEnvVar('TIMIDITY_CFG', 'timidity.cfg');
 {$ENDIF ANDROID}
 
-  for f := 1 to ParamCount do
+  f := 1;
+  while f <= ParamCount do
+  begin
+    case ParamStr(f) of
+    '--gdb': noct := true;
+    '--log': conbufDumpToStdOut := true;
+    '--safe-log': e_SetSafeSlowLog(true);
+    '--log-file':
+      if f + 1 <= ParamCount then
+      begin
+        Inc(f);
+        LogFileName := ParamStr(f)
+      end;
+    end;
+    Inc(f)
+  end;
+
+  if LogFileName = '' then
   begin
-         if ParamStr(f) = '--gdb' then noct := true
-    else if ParamStr(f) = '--log' then conbufDumpToStdOut := true
-    else if ParamStr(f) = '--safe-log' then e_SetSafeSlowLog(true);
+{$IFDEF HEADLESS}
+    LogFileName := 'Doom2DF_H.log';
+{$ELSE}
+    LogFileName := 'Doom2DF.log';
+{$ENDIF}
   end;
+
   if noct then
   begin
     Main()