put "{$MODE ...}" directive in each source file; removed trailing spaces, and convert...

[d2df-sdl.git] / src / game / Doom2DF.dpr

diff --git a/src/game/Doom2DF.dpr b/src/game/Doom2DF.dpr
index df5de459a118d12c5b4c42ec287d16b5ad0adb22..ac174d86c59a4e1139f7d18bd9a984b6e9376c87 100644 (file)
--- a/src/game/Doom2DF.dpr
+++ b/src/game/Doom2DF.dpr
@@ -1,6 +1,7 @@
+{$MODE DELPHI}
 program Doom2DF;
 {$IFNDEF HEADLESS}
-  {$IFDEF WIN32}
+  {$IFDEF WINDOWS}
     {$APPTYPE GUI}
   {$ENDIF}
 {$ENDIF}
@@ -42,14 +43,12 @@ uses
   e_sound in '../engine/e_sound.pas',
   e_textures in '../engine/e_textures.pas',
   e_fixedbuffer in '../engine/e_fixedbuffer.pas',
+  utils in '../shared/utils.pas',
+  xstreams in '../shared/xstreams.pas',
   sfs in '../sfs/sfs.pas',
   sfsPlainFS in '../sfs/sfsPlainFS.pas',
   sfsZipFS in '../sfs/sfsZipFS.pas',
-  sfsMemFS in '../sfs/sfsMemFS.pas',
-  xstreams in '../sfs/xstreams.pas',
-  utils in '../shared/utils.pas',
-  WADEDITOR in '../shared/WADEDITOR.pas',
-  WADSTRUCT in '../shared/WADSTRUCT.pas',
+  wadreader in '../shared/wadreader.pas',
   MAPSTRUCT in '../shared/MAPSTRUCT.pas',
   MAPREADER in '../shared/MAPREADER.pas',
   MAPDEF in '../shared/MAPDEF.pas',
@@ -79,7 +78,7 @@ uses
   g_triggers in 'g_triggers.pas',
   g_weapons in 'g_weapons.pas',
   g_window in 'g_window.pas',
-  sysutils,
+  SysUtils,
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
   fmoderrors in '../lib/FMOD/fmoderrors.pas',
@@ -90,19 +89,26 @@ uses
   g_panel in 'g_panel.pas',
   g_language in 'g_language.pas';
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
   {$R *.res}
   {$R CustomRes.res}
 {$ENDIF}
 
+var
+  f: Integer;
+  noct: Boolean = false;
 begin
-  try
-    Main();
-    e_WriteLog('Shutdown with no errors.', MSG_NOTIFY);
-  except
-    on E: Exception do
-      e_WriteLog(Format(_lc[I_SYSTEM_ERROR_MSG], [E.Message]), MSG_FATALERROR);
-    else
-      e_WriteLog(Format(_lc[I_SYSTEM_ERROR_UNKNOWN], [LongWord(ExceptAddr())]), MSG_FATALERROR);
-  end;
+  for f := 1 to ParamCount do if ParamStr(f) = '--gdb' then noct := true;
+  if noct then
+    Main()
+  else
+    try
+      Main();
+      e_WriteLog('Shutdown with no errors.', MSG_NOTIFY);
+    except
+      on E: Exception do
+        e_WriteLog(Format(_lc[I_SYSTEM_ERROR_MSG], [E.Message]), MSG_FATALERROR);
+      else
+        e_WriteLog(Format(_lc[I_SYSTEM_ERROR_UNKNOWN], [LongWord(ExceptAddr())]), MSG_FATALERROR);
+    end;
 end.