Merge branch 'master' of ssh://repo.or.cz/d2df-sdl

diff --combined src/game/Doom2DF.lpr
index daf5f462bdeb870306b7ec747cfaed79f1700111,e95d6232a2f72d66c17ce9631d2861e474129ee4..5162d93ca16ec6b53360d46a7fc4774d93719f98
--- 1/src/game/Doom2DF.dpr
--- 2/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@@ -108,24 -108,18 +108,23 @@@ use
    envvars in '../shared/envvars.pas',
    g_panel in 'g_panel.pas',
    g_language in 'g_language.pas',
 +
 +  sdlcarcass in '../flexui/sdlcarcass.pas',
 +  //sdlstandalone in '../flexui/sdlstandalone.pas',
 +
 +  fui_common in '../flexui/fui_common.pas',
 +  fui_gfx_gl in '../flexui/fui_gfx_gl.pas',
 +  fui_events in '../flexui/fui_events.pas',
 +  fui_style in '../flexui/fui_style.pas',
 +  fui_flexlay in '../flexui/fui_flexlay.pas',
 +  fui_ctls in '../flexui/fui_ctls.pas',
 +
    ImagingTypes,
    Imaging,
 -  ImagingUtility,
 -  sdlcarcass in '../gx/sdlcarcass.pas',
 -  glgfx in '../gx/glgfx.pas',
 -  gh_ui_common in '../gx/gh_ui_common.pas',
 -  gh_ui_style in '../gx/gh_ui_style.pas',
 -  gh_ui in '../gx/gh_ui.pas',
 -  gh_flexlay in '../gx/gh_flexlay.pas';
 +  ImagingUtility;
  
  {$IFDEF WINDOWS}
    {$R *.res}
-   {$R CustomRes.res}
  {$ENDIF}
  
  var