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

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 8808d63..7934ed1 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,13 +21,40 @@
 {$ENDIF}
 {$HINTS OFF}
 
-{$IFDEF USE_SDLMIXER}
- {$IFDEF USE_FMOD}
-  {$ERROR define only one of USE_SDLMIXER or USE_FMOD}
- {$ENDIF}
+{$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}
- {$UNDEF USE_SDLMIXER}
- {$DEFINE USE_FMOD}
+  {$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
@@ -42,19 +68,58 @@ uses
   conbuf in '../shared/conbuf.pas',
   geom in '../shared/geom.pas',
   math,
-{$IFDEF USE_NANOGL}
-  nanoGL in '../lib/nanogl/nanoGL.pas',
-{$ELSE}
-  GL,
-  GLExt,
-{$ENDIF}
+
+{$INCLUDE ../nogl/noGLuses.inc}
+
 {$IFDEF USE_MINIUPNPC}
   miniupnpc in '../lib/miniupnpc/miniupnpc.pas',
 {$ENDIF}
+
+{$IFDEF USE_SDL}
+  SDL,
+{$ENDIF}
+{$IFDEF USE_SDL2}
   SDL2 in '../lib/sdl2/sdl2.pas',
-{$IFDEF USE_SDLMIXER}
-  SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
+  {$IFDEF USE_SDLMIXER}
+    SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
+  {$ENDIF}
 {$ENDIF}
+
+{$IFDEF USE_OPENAL}
+  AL in '../lib/openal/al.pas',
+  e_soundfile in '../engine/e_soundfile.pas',
+  {$IF DEFINED(USE_SDL) OR DEFINED(USE_SDL2)}
+    e_soundfile_wav in '../engine/e_soundfile_wav.pas',
+  {$ENDIF}
+  {$IFDEF USE_VORBIS}
+    vorbis in '../lib/vorbis/vorbis.pas',
+    e_soundfile_vorbis in '../engine/e_soundfile_vorbis.pas',
+  {$ENDIF}
+  {$IFDEF USE_FLUIDSYNTH}
+    fluidsynth in '../lib/fluidsynth/fluidsynth.pas',
+    e_soundfile_fluid in '../engine/e_soundfile_fluid.pas',
+  {$ENDIF}
+  {$IFDEF USE_MODPLUG}
+    modplug in '../lib/modplug/modplug.pas',
+    e_soundfile_modplug in '../engine/e_soundfile_modplug.pas',
+  {$ENDIF}
+  {$IFDEF USE_XMP}
+    xmp in '../lib/xmp/xmp.pas',
+    e_soundfile_xmp in '../engine/e_soundfile_xmp.pas',
+  {$ENDIF}
+  {$IFDEF USE_MPG123}
+    mpg123 in '../lib/mpg123/mpg123.pas',
+    e_soundfile_mp3 in '../engine/e_soundfile_mp3.pas',
+  {$ENDIF}
+  {$IFDEF USE_OPUS}
+    opus in '../lib/opus/opus.pas',
+    e_soundfile_opus in '../engine/e_soundfile_opus.pas',
+  {$ENDIF}
+  {$IF DEFINED(USE_VORBIS) OR DEFINED(USE_OPUS)}
+    ogg in '../lib/vorbis/ogg.pas', // this has to come last because link order
+  {$ENDIF}
+{$ENDIF}
+
   ENet in '../lib/enet/enet.pp',
   e_graphics in '../engine/e_graphics.pas',
   e_input in '../engine/e_input.pas',
@@ -96,7 +161,19 @@ uses
   g_triggers in 'g_triggers.pas',
   g_weapons in 'g_weapons.pas',
   g_window in 'g_window.pas',
-  g_holmes in 'g_holmes.pas',
+{$IFDEF USE_SYSSTUB}
+  g_system in 'stub/g_system.pas',
+  g_touch in 'stub/g_touch.pas',
+{$ENDIF}
+{$IFDEF USE_SDL}
+  g_system in 'sdl/g_system.pas',
+  g_touch in 'sdl/g_touch.pas',
+{$ENDIF}
+{$IFDEF USE_SDL2}
+  g_system in 'sdl2/g_system.pas',
+  g_touch in 'sdl2/g_touch.pas',
+{$ENDIF}
+
   SysUtils,
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
@@ -107,6 +184,7 @@ uses
   xprofiler in '../shared/xprofiler.pas',
   binheap in '../shared/binheap.pas',
   hashtable in '../shared/hashtable.pas',
+  fhashdb in '../shared/fhashdb.pas',
   idpool in '../shared/idpool.pas',
   xparser in '../shared/xparser.pas',
   xdynrec in '../shared/xdynrec.pas',
@@ -115,6 +193,9 @@ uses
   g_panel in 'g_panel.pas',
   g_language in 'g_language.pas',
 
+{$IFDEF ENABLE_HOLMES}
+  g_holmes in 'g_holmes.pas',
+
   sdlcarcass in '../flexui/sdlcarcass.pas',
   //sdlstandalone in '../flexui/sdlstandalone.pas',
 
@@ -125,6 +206,7 @@ uses
   fui_style in '../flexui/fui_style.pas',
   fui_flexlay in '../flexui/fui_flexlay.pas',
   fui_ctls in '../flexui/fui_ctls.pas',
+{$ENDIF}
 
   ImagingTypes,
   Imaging,
@@ -141,6 +223,9 @@ function SDL_main(argc: CInt; argv: PPChar): CInt; cdecl;
 var
   f: Integer;
   noct: Boolean = false;
+{$IFDEF ANDROID}
+  storage: String;
+{$ENDIF}
   //tfo: Text;
 begin
   SetExceptionMask([exInvalidOp, exDenormalized, exZeroDivide, exOverflow, exUnderflow, exPrecision]); //k8: fuck off, that's why
@@ -148,26 +233,53 @@ begin
 {$IFDEF ANDROID}
 {$I-}
   e_SetSafeSlowLog(true);
-  Chdir('/sdcard/D2DF');
+  if SDL_AndroidGetExternalStorageState() <> 0 then
+  begin
+    storage := SDL_AndroidGetExternalStoragePath();
+    Chdir(storage);
+    e_WriteLog('Use external storage: ' + storage, TMsgType.Notify)
+  end
+  else
+  begin
+    storage := SDL_AndroidGetInternalStoragePath();
+    Chdir(storage);
+    e_WriteLog('Use internal storage: ' + storage, TMsgType.Notify)
+  end;
   if IOresult <> 0 then
   begin
-    Mkdir('/sdcard/D2DF');
-    Chdir('/sdcard/D2DF');
-    if IOresult <> 0 then
-    begin
-      e_WriteLog('Fail: cant chdir /sdcard/D2DF', TMsgType.Fatal);
-      result := 1;
-      exit;
-    end;
+    SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, PChar('Invalid path'), PChar('Can''t chdir to ' + storage), nil);
+    result := 1;
+    exit
   end;
+  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()