diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 561dc361399d0b4b413567cbd33d8318df712d50..5e7603888fe9295e5d1412fc3ea1890326a82287 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
geom in '../shared/geom.pas',
math,
geom in '../shared/geom.pas',
math,
-{$INCLUDE ../nogl/noGLuses.inc}
-
{$IFDEF USE_MINIUPNPC}
miniupnpc in '../lib/miniupnpc/miniupnpc.pas',
{$ENDIF}
{$IFDEF USE_SDL}
{$IFDEF USE_MINIUPNPC}
miniupnpc in '../lib/miniupnpc/miniupnpc.pas',
{$ENDIF}
{$IFDEF USE_SDL}
- SDL,
+ SDL in '../lib/sdl/sdl.pas',
{$IFDEF USE_SDLMIXER}
{$IFDEF USE_SDLMIXER}
- SDL_mixer,
+ SDL_mixer in '../lib/sdl/sdl_mixer.pas',
{$ENDIF}
{$ENDIF}
{$IFDEF USE_SDL2}
{$ENDIF}
{$ENDIF}
{$IFDEF USE_SDL2}
xmp in '../lib/xmp/xmp.pas',
e_soundfile_xmp in '../engine/e_soundfile_xmp.pas',
{$ENDIF}
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',
{$IFDEF USE_MPG123}
mpg123 in '../lib/mpg123/mpg123.pas',
e_soundfile_mp3 in '../engine/e_soundfile_mp3.pas',
{$ENDIF}
ENet in '../lib/enet/enet.pp',
{$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_input in '../engine/e_input.pas',
e_log in '../engine/e_log.pas',
e_sound in '../engine/e_sound.pas',
wadreader in '../shared/wadreader.pas',
MAPDEF in '../shared/MAPDEF.pas',
CONFIG in '../shared/CONFIG.pas',
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',
g_basic in 'g_basic.pas',
g_console in 'g_console.pas',
g_net in 'g_net.pas',
g_touch in 'sdl2/g_touch.pas',
{$ENDIF}
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',
{$IFDEF USE_FMOD}
fmod in '../lib/FMOD/fmod.pas',
fmoderrors in '../lib/FMOD/fmoderrors.pas',
{$ENDIF}
//tfo: Text;
begin
{$ENDIF}
//tfo: Text;
begin
- SetExceptionMask([exInvalidOp, exDenormalized, exZeroDivide, exOverflow, exUnderflow, exPrecision]); //k8: fuck off, that's why
-
{$IFDEF ANDROID}
{$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
f := 1;
while f <= ParamCount do