X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=33a069dc79288ea61dd312f8b0742dd285afe121;hb=656407d4bcc9419011375f19ad756d9ab7254f89;hp=3282cab97e9277059454f2fed173afd9fb7c6bd0;hpb=4b20cdc218fe2210f1462d9f54ca7f794b9a4df0;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 3282cab..33a069d 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -167,35 +167,9 @@ uses
   {$ENDIF}
 
 {$IFDEF ENABLE_RENDER}
-  {$IF DEFINED(USE_OPENGL) OR DEFINED(USE_GLES1) OR DEFINED(USE_GLSTUB)}
-    {$I ../shared/vampimg.inc}
-    r_animations in 'opengl/r_animations.pas',
-    r_console in 'opengl/r_console.pas',
-    r_game in 'opengl/r_game.pas',
-    {$IFDEF ENABLE_GFX}
-      r_gfx in 'opengl/r_gfx.pas',
-    {$ENDIF}
-    r_graphics in 'opengl/r_graphics.pas',
-    r_items in 'opengl/r_items.pas',
-    r_map in 'opengl/r_map.pas',
-    r_monsters in 'opengl/r_monsters.pas',
-    r_netmaster in 'opengl/r_netmaster.pas',
-    r_player in 'opengl/r_player.pas',
-    r_playermodel in 'opengl/r_playermodel.pas',
-    r_render in 'opengl/r_render.pas',
-    r_texture in 'opengl/r_texture.pas',
-    r_textures in 'opengl/r_textures.pas',
-    r_weapons in 'opengl/r_weapons.pas',
-    r_window in 'opengl/r_window.pas',
-    {$IFDEF ENABLE_TOUCH}
-      r_touch in 'opengl/r_touch.pas',
-    {$ENDIF}
-    {$IFDEF ENABLE_MENU}
-      r_gui in 'opengl/r_gui.pas',
-    {$ENDIF}
-  {$ELSEIF DEFINED(USE_STUBRENDER)}
+  {$IF DEFINED(USE_STUBRENDER)}
     r_render in 'renders/stub/r_render.pas',
-  {$ELSEIF DEFINED(USE_NEWGL)}
+  {$ELSEIF DEFINED(USE_OPENGL) OR DEFINED(USE_GLES1) OR DEFINED(USE_GLSTUB) OR DEFINED(USE_NEWGL)}
     {$I ../shared/vampimg.inc}
     r_render in 'renders/opengl/r_render.pas',
     r_atlas in 'renders/opengl/r_atlas.pas',
@@ -205,9 +179,15 @@ uses
     r_fonts in 'renders/opengl/r_fonts.pas',
     r_common in 'renders/opengl/r_common.pas',
     r_console in 'renders/opengl/r_console.pas',
-    r_gui in 'renders/opengl/r_gui.pas',
+    {$IFDEF ENABLE_MENU}
+      r_gui in 'renders/opengl/r_gui.pas',
+    {$ENDIF}
     r_loadscreen in 'renders/opengl/r_loadscreen.pas',
+    {$IFDEF ENABLE_TOUCH}
+      r_touch in 'renders/opengl/r_touch.pas',
+    {$ENDIF}
     {$IFDEF ENABLE_HOLMES}
+      r_fui_gfx_gl in 'renders/opengl/r_fui_gfx_gl.pas',
       r_holmes in 'renders/opengl/r_holmes.pas',
     {$ENDIF}
   {$ELSE}
@@ -241,8 +221,7 @@ uses
 
   fui_wadread in '../flexui/fui_wadread.pas',
   fui_common in '../flexui/fui_common.pas',
-//  fui_gfx in '../flexui/fui_gfx.pas',
-  fui_gfx_gl in '../flexui/fui_gfx_gl.pas',
+  fui_gfx in '../flexui/fui_gfx.pas',
   fui_events in '../flexui/fui_events.pas',
   fui_style in '../flexui/fui_style.pas',
   fui_flexlay in '../flexui/fui_flexlay.pas',
@@ -898,11 +877,11 @@ end;
       if not fuiAddWad('./data/flexui.wad') then fuiAddWad('./flexui.wad');
     end;
     try
-      fuiGfxLoadFont('win8', 'flexui/fonts/win8.fuifont');
-      fuiGfxLoadFont('win14', 'flexui/fonts/win14.fuifont');
-      fuiGfxLoadFont('win16', 'flexui/fonts/win16.fuifont');
-      fuiGfxLoadFont('dos8', 'flexui/fonts/dos8.fuifont');
-      fuiGfxLoadFont('msx6', 'flexui/fonts/msx6.fuifont');
+      gxGfxLoadFont('win8', 'flexui/fonts/win8.fuifont');
+      gxGfxLoadFont('win14', 'flexui/fonts/win14.fuifont');
+      gxGfxLoadFont('win16', 'flexui/fonts/win16.fuifont');
+      gxGfxLoadFont('dos8', 'flexui/fonts/dos8.fuifont');
+      gxGfxLoadFont('msx6', 'flexui/fonts/msx6.fuifont');
     except on e: Exception do
       begin
         writeln('ERROR loading FlexUI fonts');