aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code
diff options
context:
space:
mode:
authorjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-10-11 22:17:00 +0000
committerjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-10-11 22:17:00 +0000
commit8ee7ea3da21b01a83a048f8b710b7b7b6dcf7c1f (patch)
tree17f278d430d2a7fad17fe780db06911cd6fb0600 /Game/Code
parent351fa9712a58c3903d710b3911f8f1463ec86226 (diff)
downloadusdx-8ee7ea3da21b01a83a048f8b710b7b7b6dcf7c1f.tar.gz
usdx-8ee7ea3da21b01a83a048f8b710b7b7b6dcf7c1f.tar.xz
usdx-8ee7ea3da21b01a83a048f8b710b7b7b6dcf7c1f.zip
modifications to make new UMusic
work correctly in linux. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@511 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/UltraStar.lpr10
1 files changed, 5 insertions, 5 deletions
diff --git a/Game/Code/UltraStar.lpr b/Game/Code/UltraStar.lpr
index 59e6b2ef..56c1ef92 100644
--- a/Game/Code/UltraStar.lpr
+++ b/Game/Code/UltraStar.lpr
@@ -122,8 +122,10 @@ uses
UMain in 'Classes\UMain.pas',
UMusic in 'Classes\UMusic.pas',
// UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas',
- UAudio_Bass in 'Classes\UAudio_Bass.pas',
-
+{$ifdef win32}
+ UAudio_bass in 'Classes\UAudio_bass.pas',
+{$endif}
+
UParty in 'Classes\UParty.pas',
UPlaylist in 'Classes\UPlaylist.pas',
URecord in 'Classes\URecord.pas',
@@ -416,9 +418,7 @@ exit;
// Sound
Log.BenchmarkStart(1);
- Log.LogStatus('Initialize Sound', 'Initialization');
- Log.LogStatus('Creating Music', 'InitializeSound'); Music := TMusic.Create;
- InitializeSound;
+ Log.LogStatus('Initialize Sound', 'Initialization'); InitializeSound();
Log.BenchmarkEnd(1);
Log.LogBenchmark('Initializing Sound', 1);