From 06b754fdbc1bad124b6057d06056a1233d910933 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 17 Dec 2007 11:28:03 +0000
Subject: - changed compiler-switch FFMpegAudio to UseFFMpegAudio - UseProjectM
 splitted into UseProjectM_0_9 or UseProjectM_1_0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@710 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/UltraStar.dpr | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Game')

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index bd8c42ac..7b0b85a8 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -16,7 +16,7 @@ uses
   sdl                    in 'lib\JEDI-SDLv1.0\SDL\Pas\sdl.pas',
   sdl_image              in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas',
   sdl_ttf                in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas',
-  sdlutils               in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', 
+  sdlutils               in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas',
 
   {$ifdef UseBass}
   bass          in 'lib\bass\delphi\bass.pas',
@@ -49,8 +49,11 @@ uses
   avio          in 'lib\ffmpeg\avio.pas',
   //swscale       in 'lib\ffmpeg\swscale.pas',
 
-  {$ifdef UseProjectM}
-  projectM     in 'lib\projectM\projectM.pas',
+  {$ifdef UseProjectM_0_9}
+  projectM      in 'lib\projectM\0.9\projectM.pas',
+  {$endif}
+  {$ifdef UseProjectM_1_0}
+  projectM      in 'lib\projectM\1.0\projectM.pas',
   {$endif}
 
   SQLiteTable3  in 'lib\SQLite\SQLiteTable3.pas',
@@ -145,7 +148,7 @@ uses
 {$ifdef UsePortaudio}
   UAudio_portaudio in 'Classes\UAudio_portaudio.pas',
 {$endif}
-{$ifdef FFMpegAudio}
+{$ifdef UseFFMpegAudio}
   UAudio_FFMpeg   in 'Classes\UAudio_FFMpeg.pas',
 {$endif}
 
-- 
cgit v1.2.3