mixer: allow to use sdl 1.2 + sdl_mixer

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

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 076980afd984b2fdb3001407bea70026cac7caaf..8aa1809258ffe8270e8d4681eaa63adc29102e4b 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -41,9 +41,9 @@ uses
 {$ENDIF}
 
 {$IFDEF USE_SDL}
-  SDL,
+  SDL in '../lib/sdl/sdl.pas',
   {$IFDEF USE_SDLMIXER}
-    SDL_mixer,
+    SDL_mixer in '../lib/sdl/sdl_mixer.pas',
   {$ENDIF}
 {$ENDIF}
 {$IFDEF USE_SDL2}
@@ -81,6 +81,10 @@ uses
     xmp in '../lib/xmp/xmp.pas',
     e_soundfile_xmp in '../engine/e_soundfile_xmp.pas',
   {$ENDIF}
+  {$IFDEF USE_GME}
+    gme in '../lib/gme/gme.pas',
+    e_soundfile_gme in '../engine/e_soundfile_gme.pas',
+  {$ENDIF}
   {$IFDEF USE_MPG123}
     mpg123 in '../lib/mpg123/mpg123.pas',
     e_soundfile_mp3 in '../engine/e_soundfile_mp3.pas',
@@ -200,6 +204,11 @@ var
 {$ENDIF}
   //tfo: Text;
 begin
+{$IFDEF ANDROID}
+  System.argc := argc;
+  System.argv := argv;
+{$ENDIF}
+
   SetExceptionMask([exInvalidOp, exDenormalized, exZeroDivide, exOverflow, exUnderflow, exPrecision]); //k8: fuck off, that's why
 
   f := 1;