From d4df85930a195250d3f4a3d315921e265f6295c2 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Tue, 9 Oct 2007 10:44:00 +0000 Subject: added 3rd party units to DPR to help simplify build. ( backported from trunk ) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.01@482 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/ULCD.pas | 4 +++- Game/Code/Classes/UMusic.pas | 2 +- Game/Code/SMpeg/USmpeg.pas | 6 +++++- Game/Code/UltraStar.dpr | 35 ++++++++++++++++++++++++++++++++++- 4 files changed, 43 insertions(+), 4 deletions(-) (limited to 'Game/Code') diff --git a/Game/Code/Classes/ULCD.pas b/Game/Code/Classes/ULCD.pas index a127c689..abdf3584 100644 --- a/Game/Code/Classes/ULCD.pas +++ b/Game/Code/Classes/ULCD.pas @@ -41,7 +41,9 @@ const implementation uses - SysUtils, zlportio, UTime; + SysUtils, + zlportio, + UTime; procedure TLCD.WriteCommand(B: Byte); // Wysylanie komend sterujacych diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas index 4e647ed3..9399adb1 100644 --- a/Game/Code/Classes/UMusic.pas +++ b/Game/Code/Classes/UMusic.pas @@ -441,7 +441,7 @@ var begin Result := 60; - bytes := BASS_StreamGetLength(Bass); + bytes := BASS_ChannelGetLength( Bass ); Result := BASS_ChannelBytes2Seconds(Bass, bytes); { if Assigned(MediaPlayer) then begin diff --git a/Game/Code/SMpeg/USmpeg.pas b/Game/Code/SMpeg/USmpeg.pas index 317b04bb..40ae8694 100644 --- a/Game/Code/SMpeg/USmpeg.pas +++ b/Game/Code/SMpeg/USmpeg.pas @@ -1,7 +1,11 @@ unit USmpeg; interface -uses SDL, smpeg, OpenGL12, SysUtils, UIni; +uses SDL, + smpeg, + OpenGL12, + SysUtils, + UIni; procedure OpenSmpeg(FileName: string); procedure SkipSmpeg(Time: single); diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 8ea7c0e0..8ca8b917 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -5,6 +5,40 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} uses +//------------------------------ + //Includes - 3rd Party Libraries + //------------------------------ + SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas', + moduleloader in 'lib\JEDI-SDLv1.0\SDL\Pas\moduleloader.pas', + sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', + sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', + OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', + sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', + smpeg in 'lib\JEDI-SDLv1.0\smpeg\Pas\smpeg.pas', + + + bass in 'lib\bass\delphi\bass.pas', + + PNGImage in 'lib\PNGImage\PNGImage.pas', + PNGzLib in 'lib\PNGImage\PNGzLib.pas', + pnglang in 'lib\PNGImage\pnglang.pas', + + midiout in 'lib\midi\midiout.pas', + midiin in 'lib\midi\midiin.pas', + Circbuf in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + + zlportio in 'lib\zlportio\zlportio.pas', + ddkint in 'lib\zlportio\ddkint.pas', + + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', + SQLite3 in 'lib\SQLite\SQLite3.pas', + + //------------------------------ //Includes - Menu System //------------------------------ @@ -102,7 +136,6 @@ uses //Includes - Delphi //------------------------------ Windows, - SDL, SysUtils; const -- cgit v1.2.3