From f1f9e98eb09722bc8f8b6370331d3bb76fbdda2d Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 3 Oct 2007 11:51:44 +0000
Subject: some cleanup after mogs last commit ;)

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

(limited to 'Game/Code')

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index cdd4aca4..901bb57b 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -6,32 +6,49 @@ program UltraStar;
 {$I switches.inc}
 
 uses
-  SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas',
+  //------------------------------
+  //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',
-  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',
-  avcodec in 'lib\ffmpeg\avcodec.pas',
-  avformat in 'lib\ffmpeg\avformat.pas',
-  avutil in 'lib\ffmpeg\avutil.pas',
-  rational in 'lib\ffmpeg\rational.pas',
-  opt in 'lib\ffmpeg\opt.pas',
-  avio in 'lib\ffmpeg\avio.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',
+
+  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',
+
+  {$IFDEF UseSerialPort}
+  zlportio     in 'lib\zlportio\zlportio.pas',
+  ddkint       in 'lib\zlportio\ddkint.pas',
+  {$ENDIF}
+
+  avcodec      in 'lib\ffmpeg\avcodec.pas',
+  avformat     in 'lib\ffmpeg\avformat.pas',
+  avutil       in 'lib\ffmpeg\avutil.pas',
+  rational     in 'lib\ffmpeg\rational.pas',
+  opt          in 'lib\ffmpeg\opt.pas',
+  avio         in 'lib\ffmpeg\avio.pas',
+
   SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas',
-  SQLite3 in 'lib\SQLite\SQLite3.pas',
+  SQLite3      in 'lib\SQLite\SQLite3.pas',
+
+
+  //------------------------------
+  //Includes - Menu System
+  //------------------------------
   UDisplay in 'Menu\UDisplay.pas',
   UMenu in 'Menu\UMenu.pas',
   UMenuStatic in 'Menu\UMenuStatic.pas',
@@ -42,6 +59,10 @@ uses
   UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas',
   UDrawTexture in 'Menu\UDrawTexture.pas',
   UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas',
+
+  //------------------------------
+  //Includes - Classes
+  //------------------------------
   UCommon in 'Classes\UCommon.pas',
   UGraphic in 'Classes\UGraphic.pas',
   UTexture in 'Classes\UTexture.pas',
@@ -70,10 +91,19 @@ uses
   UDLLManager in 'Classes\UDLLManager.pas',
   UParty in 'Classes\UParty.pas',
   UPlaylist in 'Classes\UPlaylist.pas',
-  UCommandLine in 'Classes\UCommandLine.pas',
+  UCommandLine  in 'Classes\UCommandLine.pas',
+  UTextClasses in 'Classes\UTextClasses.pas',
   USingScores in 'Classes\USingScores.pas',
   USingNotes in 'Classes\USingNotes.pas',
+
+  //------------------------------
+  //Includes - Video Support
+  //------------------------------
   UVideo in 'Classes\UVideo.pas',
+
+  //------------------------------
+  //Includes - Screens
+  //------------------------------
   UScreenLoading in 'Screens\UScreenLoading.pas',
   UScreenWelcome in 'Screens\UScreenWelcome.pas',
   UScreenMain in 'Screens\UScreenMain.pas',
@@ -102,16 +132,27 @@ uses
   UScreenStatDetail in 'Screens\UScreenStatDetail.pas',
   UScreenCredits in 'Screens\UScreenCredits.pas',
   UScreenPopup in 'Screens\UScreenPopup.pas',
+
+  //------------------------------
+  //Includes - Screens PartyMode
+  //------------------------------
   UScreenSingModi in 'Screens\UScreenSingModi.pas',
   UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas',
   UScreenPartyScore in 'Screens\UScreenPartyScore.pas',
   UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas',
   UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas',
   UScreenPartyWin in 'Screens\UScreenPartyWin.pas',
+
+  //------------------------------
+  //Includes - Modi SDK
+  //------------------------------
   ModiSDK in '..\..\Modis\SDK\ModiSDK.pas',
+
+  //------------------------------
+  //Includes - Delphi
+  //------------------------------
   Windows,
-  SysUtils,
-  UTextClasses in 'Classes\UTextClasses.pas';
+  SysUtils;
 
 const
   Version = 'UltraStar Deluxe V 1.10 Alpha Build';
@@ -350,4 +391,4 @@ begin
 
   Log.Free;
 
-end.
+end.
\ No newline at end of file
-- 
cgit v1.2.3