From 56400002816820a8baede8c34f69156d574c3b96 Mon Sep 17 00:00:00 2001
From: b1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 21 Nov 2007 20:10:27 +0000
Subject: backported ffmpeg video stuff (used an older version, so this needs
 to be testet with wine)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1@623 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/UltraStar.dpr | 87 +++++++++++++++++--------------------------------
 1 file changed, 30 insertions(+), 57 deletions(-)

(limited to 'Game/Code/UltraStar.dpr')

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index fe8b5a9d..03cb275b 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -5,43 +5,29 @@ program UltraStar;
 {$R 'UltraStar.res' 'UltraStar.rc'}
 
 uses
-//------------------------------
-  //Includes - 3rd Party Libraries
-  //------------------------------
-  SDL          in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas',
+  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',
-
+  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
-  //------------------------------
+  SQLite3 in 'lib\SQLite\SQLite3.pas',
   UDisplay in 'Menu\UDisplay.pas',
   UMenu in 'Menu\UMenu.pas',
   UMenuStatic in 'Menu\UMenuStatic.pas',
@@ -52,10 +38,6 @@ uses
   UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas',
   UDrawTexture in 'Menu\UDrawTexture.pas',
   UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas',
-
-  //------------------------------
-  //Includes - Classes
-  //------------------------------
   UGraphic in 'Classes\UGraphic.pas',
   UTexture in 'Classes\UTexture.pas',
   UMusic in 'Classes\UMusic.pas',
@@ -83,11 +65,7 @@ uses
   UDLLManager in 'Classes\UDLLManager.pas',
   UParty in 'Classes\UParty.pas',
   UPlaylist in 'Classes\UPlaylist.pas',
-  UCommandLine  in 'Classes\UCommandLine.pas',
-
-  //------------------------------
-  //Includes - Screens
-  //------------------------------
+  UCommandLine in 'Classes\UCommandLine.pas',
   UScreenLoading in 'Screens\UScreenLoading.pas',
   UScreenWelcome in 'Screens\UScreenWelcome.pas',
   UScreenMain in 'Screens\UScreenMain.pas',
@@ -116,27 +94,22 @@ 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;
+  SysUtils,
+  UVideo in 'Classes\UVideo.pas',
+  avutil in 'lib\ffmpeg\avutil.pas',
+  avcodec in 'lib\ffmpeg\avcodec.pas',
+  avformat in 'lib\ffmpeg\avformat.pas',
+  opt in 'lib\ffmpeg\opt.pas',
+  rational in 'lib\ffmpeg\rational.pas',
+  avio in 'lib\ffmpeg\avio.pas';
 
 const
   Version = 'UltraStar Deluxe V 1.01';
-- 
cgit v1.2.3