diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index c86d7441e795240e6d4ec170060d2f34cc45f406..10ec8fcfcde776a12d9e699bd5ae8353081f78aa 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
{$IFDEF USE_MINIUPNPC}
miniupnpc in '../lib/miniupnpc/miniupnpc.pas',
{$ENDIF}
+{$IF DEFINED(USE_SDL2STUB) OR DEFINED(USE_SDL2ALLEGRO)}
+ SDL2 in '../wrappers/sdl2/sdl2.pas',
+ {$IFDEF USE_SDLMIXER}
+ SDL2_mixer in '../wrappers/sdl2/SDL2_mixer.pas',
+ {$ENDIF}
+{$ELSE}
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_ENETWRAP}
+ ENet in '../wrappers/enet/enet.pas',
+{$ELSE}
ENet in '../lib/enet/enet.pp',
+ {$IFDEF USE_WATT32}
+ Watt32 in '../lib/watt32/watt32.pp',
+ {$ENDIF}
+ {$IFDEF USE_LIBSOCKET}
+ Socket in '../lib/socket/socket.pas',
+ {$ENDIF}
+{$ENDIF}
+{$IFDEF USE_SDL2ALLEGRO}
+ Allegro in '../lib/allegro4/allegro.pas',
+{$ENDIF}
e_graphics in '../engine/e_graphics.pas',
e_input in '../engine/e_input.pas',
e_log in '../engine/e_log.pas',
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
{$IFDEF ANDROID}
{$I-}
e_SetSafeSlowLog(true);
- Chdir(SDL_AndroidGetExternalStoragePath());
+ 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
- Chdir(SDL_AndroidGetInternalStoragePath());
- if IOresult <> 0 then
- begin
- e_WriteLog('Fuck! Cant chdir to any game directory :(', 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}
else if ParamStr(f) = '--log' then conbufDumpToStdOut := true
else if ParamStr(f) = '--safe-log' then e_SetSafeSlowLog(true);
end;
+
if noct then
begin
Main()