diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 41c7aaca14256e6a33ec8e3891e9b0fbd8f615e3..7cbb675bd6f16d96f2506d1223b31fd31cddf9e2 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
-(* Copyright (C) DooM 2D:Forever Developers
+(* 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
{$ENDIF}
{$HINTS OFF}
-{$UNDEF XXX}
{$IFDEF USE_SDLMIXER}
- {$DEFINE XXX}
-{$ENDIF}
-{$IFDEF USE_FMOD}
- {$IFDEF XXX}
- {$ERROR define one of USE_SDLMIXER or USE_FMOD}
- {$ELSE}
- {$DEFINE XXX}
+ {$IFDEF USE_FMOD}
+ {$ERROR define only one of USE_SDLMIXER or USE_FMOD}
{$ENDIF}
-{$ENDIF}
-
-{$IFNDEF XXX}
- {$ERROR define USE_SDLMIXER or USE_FMOD}
+{$ELSE}
+ {$UNDEF USE_SDLMIXER}
+ {$DEFINE USE_FMOD}
{$ENDIF}
uses
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_wadread in '../flexui/fui_wadread.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