X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=875879fc19d5b70d820f22182822a253ce09373e;hb=331b05efe2f6761ea29488bc598661f96270909d;hp=639fbcc98597ab2ff3619d0e7f0d7355d5ae1a9d;hpb=aac50c080dd2ec5b189a5739456d593e48791aaf;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 639fbcc..875879f 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -63,13 +62,33 @@ uses
   AL in '../lib/openal/al.pas',
   e_soundfile in '../engine/e_soundfile.pas',
   e_soundfile_wav in '../engine/e_soundfile_wav.pas',
-{$IFDEF USE_MODPLUG}
-  modplug in '../lib/modplug/modplug.pas',
-  e_soundfile_modplug in '../engine/e_soundfile_modplug.pas',
-{$ELSE}
-  xmp in '../lib/xmp/xmp.pas',
-  e_soundfile_xmp in '../engine/e_soundfile_xmp.pas',
-{$ENDIF}
+  {$IFDEF USE_VORBIS}
+    vorbis in '../lib/vorbis/vorbis.pas',
+    e_soundfile_vorbis in '../engine/e_soundfile_vorbis.pas',
+  {$ENDIF}
+  {$IFDEF USE_FLUIDSYNTH}
+    fluidsynth in '../lib/fluidsynth/fluidsynth.pas',
+    e_soundfile_fluid in '../engine/e_soundfile_fluid.pas',
+  {$ENDIF}
+  {$IFDEF USE_MODPLUG}
+    modplug in '../lib/modplug/modplug.pas',
+    e_soundfile_modplug in '../engine/e_soundfile_modplug.pas',
+  {$ENDIF}
+  {$IFDEF USE_XMP}
+    xmp in '../lib/xmp/xmp.pas',
+    e_soundfile_xmp in '../engine/e_soundfile_xmp.pas',
+  {$ENDIF}
+  {$IFDEF USE_MPG123}
+    mpg123 in '../lib/mpg123/mpg123.pas',
+    e_soundfile_mp3 in '../engine/e_soundfile_mp3.pas',
+  {$ENDIF}
+  {$IFDEF USE_OPUS}
+    opus in '../lib/opus/opus.pas',
+    e_soundfile_opus in '../engine/e_soundfile_opus.pas',
+  {$ENDIF}
+  {$IF DEFINED(USE_VORBIS) OR DEFINED(USE_OPUS)}
+    ogg in '../lib/vorbis/ogg.pas', // this has to come last because link order
+  {$ENDIF}
 {$ENDIF}
   ENet in '../lib/enet/enet.pp',
   e_graphics in '../engine/e_graphics.pas',
@@ -122,6 +141,7 @@ uses
   xprofiler in '../shared/xprofiler.pas',
   binheap in '../shared/binheap.pas',
   hashtable in '../shared/hashtable.pas',
+  fhashdb in '../shared/fhashdb.pas',
   idpool in '../shared/idpool.pas',
   xparser in '../shared/xparser.pas',
   xdynrec in '../shared/xdynrec.pas',