X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=69cf03426e052d182a4c420038dc5eee71d30a8f;hb=51374402c2585a179840350b3db9681c418c3e6f;hp=0e7d21877ce2ee6ffa2867fdc7b1d8da3bda1807;hpb=09a3fc27cebc28afeb6c54d6cbc69b8b792e604d;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 0e7d218..69cf034 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
@@ -15,6 +14,7 @@
  *)
 {$INCLUDE ../shared/a_modes.inc}
 {$IFDEF ANDROID}library{$ELSE}program{$ENDIF} Doom2DF;
+
 {$IFNDEF HEADLESS}
   {$IFDEF WINDOWS}
     {$APPTYPE GUI}
@@ -22,22 +22,6 @@
 {$ENDIF}
 {$HINTS OFF}
 
-{$IF DEFINED(USE_SDLMIXER)}
-  {$IF DEFINED(USE_FMOD) OR DEFINED(USE_OPENAL)}
-    {$ERROR Only one sound driver must be selected!}
-  {$ENDIF}
-{$ELSEIF DEFINED(USE_FMOD)}
-  {$IF DEFINED(USE_SDLMIXER) OR DEFINED(USE_OPENAL)}
-    {$ERROR Only one sound driver must be selected!}
-  {$ENDIF}
-{$ELSEIF DEFINED(USE_OPENAL)}
-  {$IF DEFINED(USE_SDLMIXER) OR DEFINED(USE_FMOD)}
-    {$ERROR Only one sound driver must be selected!}
-  {$ENDIF}
-{$ELSE}
-  {$ERROR Sound driver not selected. Use -DUSE_SDLMIXER or -DUSE_FMOD or -DUSE_OPENAL}
-{$ENDIF}
-
 uses
 {$IFDEF ANDROID}
   ctypes,
@@ -55,18 +39,35 @@ uses
 {$IFDEF USE_MINIUPNPC}
   miniupnpc in '../lib/miniupnpc/miniupnpc.pas',
 {$ENDIF}
+
+{$IFDEF USE_SDL}
+  SDL,
+  {$IFDEF USE_SDLMIXER}
+    SDL_mixer,
+  {$ENDIF}
+{$ENDIF}
+{$IFDEF USE_SDL2}
   SDL2 in '../lib/sdl2/sdl2.pas',
-{$IFDEF USE_SDLMIXER}
-  SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
+  {$IFDEF USE_SDLMIXER}
+    SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
+  {$ENDIF}
 {$ENDIF}
+{$IFDEF USE_SYSSTUB}
+  {$IFDEF USE_SDLMIXER}
+    SDL2 in '../lib/sdl2/sdl2.pas',
+    SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas',
+  {$ENDIF}
+{$ENDIF}
+
 {$IFDEF USE_OPENAL}
   AL in '../lib/openal/al.pas',
   e_soundfile in '../engine/e_soundfile.pas',
-  e_soundfile_wav in '../engine/e_soundfile_wav.pas',
+  {$IF DEFINED(USE_SDL) OR DEFINED(USE_SDL2)}
+    e_soundfile_wav in '../engine/e_soundfile_wav.pas',
+  {$ENDIF}
   {$IFDEF USE_VORBIS}
     vorbis in '../lib/vorbis/vorbis.pas',
-    ogg in '../lib/vorbis/ogg.pas',
-    e_soundfile_ogg in '../engine/e_soundfile_ogg.pas',
+    e_soundfile_vorbis in '../engine/e_soundfile_vorbis.pas',
   {$ENDIF}
   {$IFDEF USE_FLUIDSYNTH}
     fluidsynth in '../lib/fluidsynth/fluidsynth.pas',
@@ -84,7 +85,15 @@ uses
     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',
   e_input in '../engine/e_input.pas',
@@ -126,7 +135,19 @@ uses
   g_triggers in 'g_triggers.pas',
   g_weapons in 'g_weapons.pas',
   g_window in 'g_window.pas',
-  SysUtils,
+{$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}
+
 {$IFDEF USE_FMOD}
   fmod in '../lib/FMOD/fmod.pas',
   fmoderrors in '../lib/FMOD/fmoderrors.pas',
@@ -136,6 +157,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',
@@ -158,10 +180,8 @@ uses
   fui_flexlay in '../flexui/fui_flexlay.pas',
   fui_ctls in '../flexui/fui_ctls.pas',
 {$ENDIF}
-
-  ImagingTypes,
-  Imaging,
-  ImagingUtility;
+  {$I ../shared/vampimg.inc}
+  SysUtils;
 
 {$IFDEF WINDOWS}
   {$R *.res}