X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2FEditor.lpr;h=21d8fe5df9a97c8f5cf532dac8b453175148170d;hb=7bc7d5022ae82e37fee8b3003432f9294176a470;hp=a0da9cee345627e9a57ab9fcbcab4aab587b794d;hpb=b72e164f0fb64e3301ae8ca217449daf6a9d301d;p=d2df-editor.git

diff --git a/src/editor/Editor.lpr b/src/editor/Editor.lpr
index a0da9ce..21d8fe5 100644
--- a/src/editor/Editor.lpr
+++ b/src/editor/Editor.lpr
@@ -1,10 +1,10 @@
 program Editor;
 
-{$MODE Delphi}
+{$INCLUDE ../shared/a_modes.inc}
 
 uses
   Forms, Interfaces,
-  dglOpenGL in '../lib/dgl/dglOpenGL.pas',
+  GL, GLExt,
   e_graphics in '../engine/e_graphics.pas',
   e_log in '../engine/e_log.pas',
   e_textures in '../engine/e_textures.pas',
@@ -15,6 +15,11 @@ uses
   WADEDITOR in '../shared/WADEDITOR.pas',
   WADSTRUCT in '../shared/WADSTRUCT.pas',
   CONFIG in '../shared/CONFIG.pas',
+  xstreams in '../shared/xstreams.pas',
+  sfs in '../sfs/sfs.pas',
+  sfsPlainFS in '../sfs/sfsPlainFS.pas',
+  sfsZipFS in '../sfs/sfsZipFS.pas',
+
   f_about in 'f_about.pas' {AboutForm},
   f_options in 'f_options.pas' {OptionsForm},
   f_main in 'f_main.pas' {MainForm},
@@ -37,17 +42,26 @@ uses
   f_packmap in 'f_packmap.pas' {PackMapForm},
   f_maptest in 'f_maptest.pas' {MapTestForm},
   f_choosetype in 'f_choosetype.pas' {ChooseTypeForm},
-  fmod in '../lib/fmod/fmod.pas',
-  fmoderrors in '../lib/fmod/fmoderrors.pas',
-  fmodpresets in '../lib/fmod/fmodpresets.pas',
-  fmodtypes in '../lib/fmod/fmodtypes.pas',
+{$IFNDEF NOSOUND}
+  fmod,
+  fmoderrors,
+  fmodpresets,
+  fmodtypes,
+{$ENDIF}
+  ImagingTypes,
+  Imaging,
+  ImagingUtility,
   g_language in 'g_language.pas',
   f_selectlang in 'f_selectlang.pas' {SelectLanguageForm};
 
-{$R *.res}
+{$IFDEF WINDOWS}
+  {$R *.res}
+{$ENDIF}
 
 begin
-  Application.Initialize;
+  Application.ExceptionDialog := aedOkMessageBox;
+  Application.Initialize();
+
   Application.CreateForm(TMainForm, MainForm);
   Application.CreateForm(TOptionsForm, OptionsForm);
   Application.CreateForm(TAboutForm, AboutForm);
@@ -67,7 +81,7 @@ begin
   Application.CreateForm(TMapTestForm, MapTestForm);
   Application.CreateForm(TChooseTypeForm, ChooseTypeForm);
   Application.CreateForm(TSelectLanguageForm, SelectLanguageForm);
-  if ParamStr(1) <> '' then OpenMap(ParamStr(1), '');
 
-  Application.Run;
+  if ParamStr(1) <> '' then OpenMap(ParamStr(1), '');
+  Application.Run();
 end.