X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.dpr;h=3df542a714c189c1cb42bc234b6e6a4bd4645bd9;hb=7817765f4dca5289934f837ee4d63316b9797f86;hp=679615611ed466084ac3c576607f7c0ca86251c5;hpb=45af139bfc7713ed4eb237ac1f5288e82706564c;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.dpr b/src/game/Doom2DF.dpr
index 6796156..3df542a 100644
--- a/src/game/Doom2DF.dpr
+++ b/src/game/Doom2DF.dpr
@@ -1,6 +1,22 @@
+(* Copyright (C)  DooM 2D:Forever Developers
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *)
+{$MODE DELPHI}
 program Doom2DF;
 {$IFNDEF HEADLESS}
-  {$IFDEF WIN32}
+  {$IFDEF WINDOWS}
     {$APPTYPE GUI}
   {$ENDIF}
 {$ENDIF}
@@ -23,6 +39,7 @@ program Doom2DF;
 {$ENDIF}
 
 uses
+  conbuf in '../shared/conbuf.pas',
   GL,
   GLExt,
   SDL2 in '../lib/sdl2/sdl2.pas',
@@ -30,26 +47,18 @@ uses
   SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
 {$ENDIF}
   ENet in '../lib/enet/enet.pp',
-  ENetTypes in '../lib/enet/enettypes.pp',
-  ENetList in '../lib/enet/enetlist.pp',
-  ENetTime in '../lib/enet/enettime.pp',
-  ENetProtocol in '../lib/enet/enetprotocol.pp',
-  ENetCallbacks in '../lib/enet/enetcallbacks.pp',
-  ENetPlatform in '../lib/enet/enetplatform.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_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 +88,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',
@@ -87,10 +96,14 @@ uses
   fmodtypes in '../lib/FMOD/fmodtypes.pas',
 {$ENDIF}
   BinEditor in '../shared/BinEditor.pas',
+  envvars in '../shared/envvars.pas',
   g_panel in 'g_panel.pas',
-  g_language in 'g_language.pas';
+  g_language in 'g_language.pas',
+  ImagingTypes,
+  Imaging,
+  ImagingUtility;
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
   {$R *.res}
   {$R CustomRes.res}
 {$ENDIF}
@@ -99,7 +112,11 @@ var
   f: Integer;
   noct: Boolean = false;
 begin
-  for f := 1 to ParamCount do if ParamStr(f) = '--gdb' then noct := true;
+  for f := 1 to ParamCount do
+  begin
+         if ParamStr(f) = '--gdb' then noct := true
+    else if ParamStr(f) = '--log' then conbufDumpToStdOut := true;
+  end;
   if noct then
     Main()
   else
@@ -110,6 +127,6 @@ begin
       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);
+        e_WriteLog(Format(_lc[I_SYSTEM_ERROR_UNKNOWN], [NativeUInt(ExceptAddr())]), MSG_FATALERROR);
     end;
 end.