diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index eb38f0e4eb351e7a34e35a59da36c88a5d97d6bf..4a8a26b78fa9ba58c6e91c6b9719e00680393a67 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
geom in '../shared/geom.pas',
math,
-{$INCLUDE ../nogl/noGLuses.inc}
-
{$IFDEF USE_MINIUPNPC}
miniupnpc in '../lib/miniupnpc/miniupnpc.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',
{$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',
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_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',
+ r_window in 'opengl/r_window.pas',
+
{$IFDEF USE_FMOD}
fmod in '../lib/FMOD/fmod.pas',
fmoderrors in '../lib/FMOD/fmoderrors.pas',
fui_flexlay in '../flexui/fui_flexlay.pas',
fui_ctls in '../flexui/fui_ctls.pas',
{$ENDIF}
-
- ImagingDds in '../lib/vampimg/ImagingDds.pas',
- ImagingFormats in '../lib/vampimg/ImagingFormats.pas',
- ImagingPcx in '../lib/vampimg/ImagingPcx.pas',
- ImagingColors in '../lib/vampimg/ImagingColors.pas',
- ImagingNetworkGraphics in '../lib/vampimg/ImagingNetworkGraphics.pas',
-// ImagingComponents in '../lib/vampimg/ImagingComponents.pas',
- ImagingRadiance in '../lib/vampimg/ImagingRadiance.pas',
- ImagingPortableMaps in '../lib/vampimg/ImagingPortableMaps.pas',
- ImagingXpm in '../lib/vampimg/ImagingXpm.pas',
- ImagingBitmap in '../lib/vampimg/ImagingBitmap.pas',
- ImagingTypes in '../lib/vampimg/ImagingTypes.pas',
- Imaging in '../lib/vampimg/Imaging.pas',
- ImagingExtras in '../lib/vampimg/ImagingExtras.pas',
- ImagingGif in '../lib/vampimg/ImagingGif.pas',
- ImagingIO in '../lib/vampimg/ImagingIO.pas',
- imjdhuff in '../lib/vampimg/JpegLib/imjdhuff.pas',
- imjdmerge in '../lib/vampimg/JpegLib/imjdmerge.pas',
- imjdapimin in '../lib/vampimg/JpegLib/imjdapimin.pas',
- imjidctflt in '../lib/vampimg/JpegLib/imjidctflt.pas',
- imjdsample in '../lib/vampimg/JpegLib/imjdsample.pas',
- imjfdctint in '../lib/vampimg/JpegLib/imjfdctint.pas',
- imjdcoefct in '../lib/vampimg/JpegLib/imjdcoefct.pas',
- imjdmainct in '../lib/vampimg/JpegLib/imjdmainct.pas',
- imjcmaster in '../lib/vampimg/JpegLib/imjcmaster.pas',
- imjdcolor in '../lib/vampimg/JpegLib/imjdcolor.pas',
- imjcphuff in '../lib/vampimg/JpegLib/imjcphuff.pas',
- imjidctint in '../lib/vampimg/JpegLib/imjidctint.pas',
- imjutils in '../lib/vampimg/JpegLib/imjutils.pas',
- imjdmarker in '../lib/vampimg/JpegLib/imjdmarker.pas',
- imjdmaster in '../lib/vampimg/JpegLib/imjdmaster.pas',
- imjmorecfg in '../lib/vampimg/JpegLib/imjmorecfg.pas',
- imjdct in '../lib/vampimg/JpegLib/imjdct.pas',
- imjcdctmgr in '../lib/vampimg/JpegLib/imjcdctmgr.pas',
- imjerror in '../lib/vampimg/JpegLib/imjerror.pas',
- imjpeglib in '../lib/vampimg/JpegLib/imjpeglib.pas',
- imjccoefct in '../lib/vampimg/JpegLib/imjccoefct.pas',
- imjfdctfst in '../lib/vampimg/JpegLib/imjfdctfst.pas',
- imjchuff in '../lib/vampimg/JpegLib/imjchuff.pas',
- imjdinput in '../lib/vampimg/JpegLib/imjdinput.pas',
- imjdapistd in '../lib/vampimg/JpegLib/imjdapistd.pas',
- imjidctfst in '../lib/vampimg/JpegLib/imjidctfst.pas',
- imjcsample in '../lib/vampimg/JpegLib/imjcsample.pas',
- imjmemmgr in '../lib/vampimg/JpegLib/imjmemmgr.pas',
- imjmemnobs in '../lib/vampimg/JpegLib/imjmemnobs.pas',
- imjfdctflt in '../lib/vampimg/JpegLib/imjfdctflt.pas',
- imjcmainct in '../lib/vampimg/JpegLib/imjcmainct.pas',
- imjcprepct in '../lib/vampimg/JpegLib/imjcprepct.pas',
- imjidctred in '../lib/vampimg/JpegLib/imjidctred.pas',
- imjcomapi in '../lib/vampimg/JpegLib/imjcomapi.pas',
-// imjidctasm in '../lib/vampimg/JpegLib/imjidctasm.pas',
- imjcapimin in '../lib/vampimg/JpegLib/imjcapimin.pas',
- imjquant1 in '../lib/vampimg/JpegLib/imjquant1.pas',
- imjquant2 in '../lib/vampimg/JpegLib/imjquant2.pas',
- imjcinit in '../lib/vampimg/JpegLib/imjcinit.pas',
- imjdphuff in '../lib/vampimg/JpegLib/imjdphuff.pas',
- imjcapistd in '../lib/vampimg/JpegLib/imjcapistd.pas',
- imjinclude in '../lib/vampimg/JpegLib/imjinclude.pas',
- imjccolor in '../lib/vampimg/JpegLib/imjccolor.pas',
- imjcmarker in '../lib/vampimg/JpegLib/imjcmarker.pas',
- imjcparam in '../lib/vampimg/JpegLib/imjcparam.pas',
- imjddctmgr in '../lib/vampimg/JpegLib/imjddctmgr.pas',
- imjdpostct in '../lib/vampimg/JpegLib/imjdpostct.pas',
- imjdeferr in '../lib/vampimg/JpegLib/imjdeferr.pas',
- ImagingCanvases in '../lib/vampimg/ImagingCanvases.pas',
- iminffast in '../lib/vampimg/ZLib/iminffast.pas',
- imzdeflate in '../lib/vampimg/ZLib/imzdeflate.pas',
- imtrees in '../lib/vampimg/ZLib/imtrees.pas',
- dzlib in '../lib/vampimg/ZLib/dzlib.pas',
- impaszlib in '../lib/vampimg/ZLib/impaszlib.pas',
- iminfcodes in '../lib/vampimg/ZLib/iminfcodes.pas',
- iminfblock in '../lib/vampimg/ZLib/iminfblock.pas',
- imzutil in '../lib/vampimg/ZLib/imzutil.pas',
- imadler in '../lib/vampimg/ZLib/imadler.pas',
- imzinflate in '../lib/vampimg/ZLib/imzinflate.pas',
- iminfutil in '../lib/vampimg/ZLib/iminfutil.pas',
- iminftrees in '../lib/vampimg/ZLib/iminftrees.pas',
- ImagingJpeg in '../lib/vampimg/ImagingJpeg.pas',
- ImagingClasses in '../lib/vampimg/ImagingClasses.pas',
- ImagingPsd in '../lib/vampimg/ImagingPsd.pas',
- ImagingTarga in '../lib/vampimg/ImagingTarga.pas',
- ImagingUtility in '../lib/vampimg/ImagingUtility.pas';
+ {$I ../shared/vampimg.inc}
+ SysUtils;
{$IFDEF WINDOWS}
{$R *.res}
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
Inc(f)
end;
- if LogFileName = '' then
- begin
-{$IFDEF HEADLESS}
- LogFileName := 'Doom2DF_H.log';
-{$ELSE}
- LogFileName := 'Doom2DF.log';
-{$ENDIF}
- end;
-
if noct then
begin
Main()