Android: added timidity.cfg to game files, so midi music can playing now

[d2df-sdl.git] / src / game / Doom2DF.lpr

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 0b62430ad3d7c369f4dcf485b6f4fbb65f8e1f67..c86d7441e795240e6d4ec170060d2f34cc45f406 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -42,12 +42,9 @@ uses
   conbuf in '../shared/conbuf.pas',
   geom in '../shared/geom.pas',
   math,
-{$IFDEF USE_NANOGL}
-  nanoGL in '../lib/nanogl/nanoGL.pas',
-{$ELSE}
-  GL,
-  GLExt,
-{$ENDIF}
+
+{$INCLUDE ../nogl/noGLuses.inc}
+
 {$IFDEF USE_MINIUPNPC}
   miniupnpc in '../lib/miniupnpc/miniupnpc.pas',
 {$ENDIF}
@@ -96,7 +93,6 @@ uses
   g_triggers in 'g_triggers.pas',
   g_weapons in 'g_weapons.pas',
   g_window in 'g_window.pas',
-  g_holmes in 'g_holmes.pas',
   SysUtils,
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
@@ -115,6 +111,9 @@ uses
   g_panel in 'g_panel.pas',
   g_language in 'g_language.pas',
 
+{$IFDEF ENABLE_HOLMES}
+  g_holmes in 'g_holmes.pas',
+
   sdlcarcass in '../flexui/sdlcarcass.pas',
   //sdlstandalone in '../flexui/sdlstandalone.pas',
 
@@ -125,6 +124,7 @@ uses
   fui_style in '../flexui/fui_style.pas',
   fui_flexlay in '../flexui/fui_flexlay.pas',
   fui_ctls in '../flexui/fui_ctls.pas',
+{$ENDIF}
 
   ImagingTypes,
   Imaging,
@@ -159,6 +159,7 @@ begin
       exit;
     end;
   end;
+  SetEnvVar('TIMIDITY_CFG', 'timidity.cfg');
 {$ENDIF ANDROID}
 
   for f := 1 to ParamCount do