X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=5e7603888fe9295e5d1412fc3ea1890326a82287;hb=541bba4ec498539ae13827e2c821b1eb8bca7db8;hp=561dc361399d0b4b413567cbd33d8318df712d50;hpb=414f2873efa0cce84499f64774db7000e6268971;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 561dc36..5e76038 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -34,16 +34,14 @@ uses
   geom in '../shared/geom.pas',
   math,
 
-{$INCLUDE ../nogl/noGLuses.inc}
-
 {$IFDEF USE_MINIUPNPC}
   miniupnpc in '../lib/miniupnpc/miniupnpc.pas',
 {$ENDIF}
 
 {$IFDEF USE_SDL}
-  SDL,
+  SDL in '../lib/sdl/sdl.pas',
   {$IFDEF USE_SDLMIXER}
-    SDL_mixer,
+    SDL_mixer in '../lib/sdl/sdl_mixer.pas',
   {$ENDIF}
 {$ENDIF}
 {$IFDEF USE_SDL2}
@@ -81,6 +79,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',
@@ -95,7 +97,6 @@ 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',
@@ -110,6 +111,7 @@ uses
   wadreader in '../shared/wadreader.pas',
   MAPDEF in '../shared/MAPDEF.pas',
   CONFIG in '../shared/CONFIG.pas',
+  g_base in 'g_base.pas',
   g_basic in 'g_basic.pas',
   g_console in 'g_console.pas',
   g_net in 'g_net.pas',
@@ -149,6 +151,20 @@ uses
   g_touch in 'sdl2/g_touch.pas',
 {$ENDIF}
 
+  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',
+  r_window in 'opengl/r_window.pas',
+
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
   fmoderrors in '../lib/FMOD/fmoderrors.pas',
@@ -200,31 +216,12 @@ var
 {$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}
+  System.argc := argc;
+  System.argv := argv;
+{$ENDIF}
+
+  SetExceptionMask([exInvalidOp, exDenormalized, exZeroDivide, exOverflow, exUnderflow, exPrecision]); //k8: fuck off, that's why
 
   f := 1;
   while f <= ParamCount do