X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=c5854789fedc0b0b23b3ebe9038a47af4c45a331;hb=5c816a8e702fd39c65d0928a3315d81e979f30fb;hp=b5b7bae947b82277e1c9dd8a34eddf758cfac026;hpb=87c3a28dda4534eec3fde4ef06dc5f324b2c4b3b;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index b5b7bae..c585478 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -42,6 +42,9 @@ uses
 
 {$IFDEF USE_SDL}
   SDL,
+  {$IFDEF USE_SDLMIXER}
+    SDL_mixer,
+  {$ENDIF}
 {$ENDIF}
 {$IFDEF USE_SDL2}
   SDL2 in '../lib/sdl2/sdl2.pas',
@@ -49,6 +52,12 @@ uses
     SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
   {$ENDIF}
 {$ENDIF}
+{$IFDEF USE_SYSSTUB}
+  {$IFDEF USE_SDLMIXER}
+    SDL2 in '../lib/sdl2/sdl2.pas',
+    SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
+  {$ENDIF}
+{$ENDIF}
 
 {$IFDEF USE_OPENAL}
   AL in '../lib/openal/al.pas',
@@ -72,6 +81,10 @@ uses
     xmp in '../lib/xmp/xmp.pas',
     e_soundfile_xmp in '../engine/e_soundfile_xmp.pas',
   {$ENDIF}
+  {$IFDEF USE_GME}
+    gme in '../lib/gme/gme.pas',
+    e_soundfile_gme in '../engine/e_soundfile_gme.pas',
+  {$ENDIF}
   {$IFDEF USE_MPG123}
     mpg123 in '../lib/mpg123/mpg123.pas',
     e_soundfile_mp3 in '../engine/e_soundfile_mp3.pas',
@@ -86,12 +99,12 @@ uses
 {$ENDIF}
 
   ENet in '../lib/enet/enet.pp',
-  e_graphics in '../engine/e_graphics.pas',
   e_input in '../engine/e_input.pas',
   e_log in '../engine/e_log.pas',
   e_sound in '../engine/e_sound.pas',
   e_texture in '../engine/e_texture.pas',
   e_msg in '../engine/e_msg.pas',
+  e_res in '../engine/e_res.pas',
   utils in '../shared/utils.pas',
   xstreams in '../shared/xstreams.pas',
   sfs in '../sfs/sfs.pas',
@@ -139,7 +152,19 @@ uses
   g_touch in 'sdl2/g_touch.pas',
 {$ENDIF}
 
-  SysUtils,
+  r_console in 'opengl/r_console.pas',
+  r_game in 'opengl/r_game.pas',
+  r_gfx in 'opengl/r_gfx.pas',
+  r_graphics in 'opengl/r_graphics.pas',
+  r_items in 'opengl/r_items.pas',
+  r_map in 'opengl/r_map.pas',
+  r_monsters in 'opengl/r_monsters.pas',
+  r_netmaster in 'opengl/r_netmaster.pas',
+  r_panel in 'opengl/r_panel.pas',
+  r_player in 'opengl/r_player.pas',
+  r_playermodel in 'opengl/r_playermodel.pas',
+  r_weapons in 'opengl/r_weapons.pas',
+
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
   fmoderrors in '../lib/FMOD/fmoderrors.pas',
@@ -172,10 +197,8 @@ uses
   fui_flexlay in '../flexui/fui_flexlay.pas',
   fui_ctls in '../flexui/fui_ctls.pas',
 {$ENDIF}
-
-  ImagingTypes,
-  Imaging,
-  ImagingUtility;
+  {$I ../shared/vampimg.inc}
+  SysUtils;
 
 {$IFDEF WINDOWS}
   {$R *.res}
@@ -195,30 +218,6 @@ var
 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}
-
   f := 1;
   while f <= ParamCount do
   begin
@@ -236,15 +235,6 @@ begin
     Inc(f)
   end;
 
-  if LogFileName = '' then
-  begin
-{$IFDEF HEADLESS}
-    LogFileName := 'Doom2DF_H.log';
-{$ELSE}
-    LogFileName := 'Doom2DF.log';
-{$ENDIF}
-  end;
-
   if noct then
   begin
     Main()