X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=53020f419c5a1886f69eb0167ca032fb43cde9e2;hb=ccbaf6953ba60385f0fd86ec5921c81ecd6fe08b;hp=62154079cdcc0bbac8c409da55df19d2d31193d8;hpb=f4fc3b435118e5d9e4085da37014436d2e063259;p=d2df-sdl.git diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr index 6215407..53020f4 100644 --- a/src/game/Doom2DF.lpr +++ b/src/game/Doom2DF.lpr @@ -14,7 +14,7 @@ * along with this program. If not, see . *) {$INCLUDE ../shared/a_modes.inc} -program Doom2DF; +{$IFDEF ANDROID}library{$ELSE}program{$ENDIF} Doom2DF; {$IFNDEF HEADLESS} {$IFDEF WINDOWS} {$APPTYPE GUI} @@ -32,6 +32,9 @@ program Doom2DF; {$ENDIF} uses +{$IFDEF ANDROID} + ctypes, +{$ENDIF} {$IFDEF UNIX} cthreads, {$ENDIF} @@ -39,20 +42,34 @@ 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} +{$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 GO32V2} + Watt32 in '../lib/watt32/watt32.pp', + {$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', @@ -93,7 +110,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', @@ -112,6 +128,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', @@ -122,6 +141,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, @@ -131,18 +151,51 @@ 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 + +{$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} + for f := 1 to ParamCount do 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); end; + if noct then begin Main() @@ -173,4 +226,10 @@ begin end; end; e_DeinitLog(); + +{$IFDEF ANDROID} + result := 0; +end; // SDL_main +exports SDL_main; +{$ENDIF ANDROID} end.