* added missed dependency PNGImage.

* moved FUNCTION InitializePaths(), from uFiles to
  uMain as this is a more sane location for it.
* updated files that used UFiles to point to UMain,
  and removed uFiles where its not needed.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@385 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 8 insertions, 2 deletions

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 1cfa64f5..842b225e 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -8,10 +8,13 @@ uses
   //------------------------------

   //Includes - 3rd Party Libraries

   //------------------------------

+  SDL          in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas',

   OpenGL12     in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas',

 

   bass         in 'lib\bass\delphi\bass.pas',

 

+  PNGImage     in 'lib\PNGImage\PNGImage.pas',

+

   midiout      in 'lib\midi\midiout.pas',

   midiin       in 'lib\midi\midiin.pas',

   Circbuf      in 'lib\midi\CIRCBUF.PAS',

@@ -136,7 +139,6 @@ uses
   //Includes - Delphi

   //------------------------------

   Windows,

-  SDL,

   SysUtils;

 

 const

@@ -219,7 +221,7 @@ begin
   Log.BenchmarkStart(1);

   Log.LogStatus('Load Ini', 'Initialization');                Ini := TIni.Create;

                                                               Ini.Load;

-

+  

   //Load Languagefile

   if (Params.Language <> -1) then

     Language.ChangeLanguage(ILanguage[Params.Language])

@@ -229,6 +231,7 @@ begin
   Log.BenchmarkEnd(1);

   Log.LogBenchmark('Loading Ini', 1);

 

+

   // LCD

   Log.BenchmarkStart(1);

   Log.LogStatus('Load LCD', 'Initialization');                LCD := TLCD.Create;

@@ -251,6 +254,7 @@ begin
   Log.BenchmarkEnd(1);

   Log.LogBenchmark('Loading Light', 1);

 

+

   // Theme

   Log.BenchmarkStart(1);

   Log.LogStatus('Load Themes', 'Initialization');             Theme := TTheme.Create('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color);

@@ -270,6 +274,8 @@ begin
   Log.BenchmarkEnd(1);

   Log.LogBenchmark('Loading Category Covers Array', 1);

 

+

+

   // Songs

   //Log.BenchmarkStart(1);

   Log.LogStatus('Creating Song Array', 'Initialization');     Songs := TSongs.Create;