X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=f8d946e730c74329686fae4c3cfccf10654b61ec;hb=6a529517007ed9becc3cd4e188f3c0e1348fda1b;hp=7cbb675bd6f16d96f2506d1223b31fd31cddf9e2;hpb=1bddfaf7b6421f1659a6f211dfdb1dfaef5d5173;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 7cbb675..f8d946e 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
 {$INCLUDE ../shared/a_modes.inc}
-program Doom2DF;
+{$IFDEF ANDROID}library{$ELSE}program{$ENDIF} Doom2DF;
 {$IFNDEF HEADLESS}
   {$IFDEF WINDOWS}
     {$APPTYPE GUI}
@@ -32,12 +32,22 @@ program Doom2DF;
 {$ENDIF}
 
 uses
+{$IFDEF ANDROID}
+  ctypes,
+{$ENDIF}
+{$IFDEF UNIX}
+  cthreads,
+{$ENDIF}
   mempool in '../shared/mempool.pas',
   conbuf in '../shared/conbuf.pas',
   geom in '../shared/geom.pas',
   math,
-  GL,
-  GLExt,
+
+{$INCLUDE ../nogl/noGLuses.inc}
+
+{$IFDEF USE_MINIUPNPC}
+  miniupnpc in '../lib/miniupnpc/miniupnpc.pas',
+{$ENDIF}
   SDL2 in '../lib/sdl2/sdl2.pas',
 {$IFDEF USE_SDLMIXER}
   SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
@@ -83,7 +93,6 @@ 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',
   SysUtils,
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
@@ -102,6 +111,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',
 
@@ -112,6 +124,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,
@@ -121,18 +134,70 @@ uses
   {$R *.res}
 {$ENDIF}
 
+{$IFDEF ANDROID}
+function SDL_main(argc: CInt; argv: PPChar): CInt; cdecl;
+{$ENDIF ANDROID}
+
 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
-  for f := 1 to ParamCount do
+
+{$IFDEF ANDROID}
+{$I-}
+  e_SetSafeSlowLog(true);
+  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
+    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}
+
+  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()
@@ -163,4 +228,10 @@ begin
     end;
   end;
   e_DeinitLog();
+
+{$IFDEF ANDROID}
+  result := 0;
+end; // SDL_main
+exports SDL_main;
+{$ENDIF ANDROID}
 end.