X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=98c39b5d6c5b15c55b27976b3878433cdea94d66;hb=b874151ca697386d74cfbd29e1c21bca1b4825e2;hp=4aecd4026ac048917850dca9611028047d7a74df;hpb=35f9a0ca016af5ef3dac8dc6ba97dcbf659f6176;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 4aecd40..98c39b5 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -144,7 +144,7 @@ uses
   g_playermodel in 'g_playermodel.pas',
   g_saveload in 'g_saveload.pas',
   g_sound in 'g_sound.pas',
-  g_textures in 'g_textures.pas',
+  g_animations in 'g_animations.pas',
   g_triggers in 'g_triggers.pas',
   g_weapons in 'g_weapons.pas',
   g_window in 'g_window.pas',
@@ -161,33 +161,54 @@ uses
     {$ENDIF}
   {$ENDIF}
 
-{$IFDEF ENABLE_RENDER}
-  {$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}
     g_gui in 'g_gui.pas',
     g_menu in 'g_menu.pas',
   {$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)}
+    r_render in 'renders/stub/r_render.pas',
+  {$ELSEIF DEFINED(USE_NEWGL)}
+    {$I ../shared/vampimg.inc}
+    r_render in 'renders/opengl/r_render.pas',
+    r_atlas in 'renders/opengl/r_atlas.pas',
+    r_textures in 'renders/opengl/r_textures.pas',
+    r_draw in 'renders/opengl/r_draw.pas',
+    r_map in 'renders/opengl/r_map.pas',
+    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',
+  {$ELSE}
+    {$FATAL render driver not selected}
+  {$ENDIF}
 {$ENDIF}
 
 {$IFDEF USE_FMOD}
@@ -390,7 +411,6 @@ begin
       begin
         itmp := 0;
         val(ParamStr(idx), itmp, valres);
-        {$IFNDEF HEADLESS}
         if (valres = 0) and (not g_holmes_imfunctional) then
         begin
           case itmp of
@@ -399,11 +419,6 @@ begin
             16: uiContext.font := 'win16';
           end;
         end;
-        {$ELSE}
-        // fuck off, fpc!
-        itmp := itmp;
-        valres := valres;
-        {$ENDIF}
         Inc(idx);
       end;
     end;
@@ -1035,7 +1050,6 @@ end;
     g_Game_Init;
     {$IFDEF ENABLE_MENU}
       g_Menu_Init;
-      g_GUI_Init;
     {$ENDIF}
     g_Game_Process_Params;
     // TODO reload GAME textures