X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=68efd413c1f51b782ddec50a1549f397156cae71;hb=83221a8d1b958465bd68e3c79575f4a94c8ffa42;hp=c56af24696221e14e974b32deaae5d8a55b6b439;hpb=6338d3fa6f58068fbde836957e6d8cfb654bb195;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index c56af24..68efd41 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -140,15 +140,12 @@ uses
 {$IFNDEF HEADLESS}
   {$IFDEF USE_SYSSTUB}
     g_system in 'stub/g_system.pas',
-    g_touch in 'stub/g_touch.pas',
   {$ENDIF}
   {$IFDEF USE_SDL}
     g_system in 'sdl/g_system.pas',
-    g_touch in 'sdl/g_touch.pas',
   {$ENDIF}
   {$IFDEF USE_SDL2}
     g_system in 'sdl2/g_system.pas',
-    g_touch in 'sdl2/g_touch.pas',
   {$ENDIF}
 {$ENDIF}
 
@@ -170,8 +167,13 @@ uses
   r_textures in 'opengl/r_textures.pas',
   r_weapons in 'opengl/r_weapons.pas',
   r_window in 'opengl/r_window.pas',
-  g_gui in 'g_gui.pas',
-  g_menu in 'g_menu.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}
 {$ENDIF}
 
 {$IFDEF USE_FMOD}
@@ -931,7 +933,9 @@ end;
       {$ENDIF}
       {$IFNDEF ANDROID}
         (* This will fix menu reset on keyboard showing *)
-        g_Menu_Reset;
+        {$IFDEF ENABLE_MENU}
+          g_Menu_Reset;
+        {$ENDIF}
       {$ENDIF}
       //g_Game_ClearLoading;
       {$IFDEF ENABLE_HOLMES}
@@ -960,7 +964,6 @@ end;
     g_Language_Set(gLanguage);
     {$IFNDEF HEADLESS}
       r_Render_Initialize;
-      g_Touch_Init;
     {$ENDIF}
     DebugOptions;
     g_Net_InitLowLevel;
@@ -975,23 +978,25 @@ end;
       r_Render_Load;
     {$ENDIF}
     g_Game_Init;
-    {$IFNDEF HEADLESS}
+    {$IFDEF ENABLE_MENU}
       g_Menu_Init;
       g_GUI_Init;
     {$ENDIF}
     g_Game_Process_Params;
     // TODO reload GAME textures
     g_Console_Init; // welcome message
-    {$IFNDEF HEADLESS}
+    {$IFDEF ENABLE_MENU}
       if (not gGameOn) and gAskLanguage then
         g_Menu_AskLanguage;
     {$ENDIF}
     Time_Old := GetTickCount64();
     while not ProcessMessage() do begin end;
     g_Console_WriteGameConfig;
-    {$IFNDEF HEADLESS}
+    {$IFDEF ENABLE_MENU}
       g_GUI_Destroy;
       g_Menu_Free;
+    {$ENDIF}
+    {$IFNDEF HEADLESS}
       r_Render_Free;
     {$ENDIF}
     {$IFDEF ENABLE_HOLMES}