aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormogguh <mogguh@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-07-15 14:56:06 +0000
committermogguh <mogguh@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-07-15 14:56:06 +0000
commit676e81e88faea63c163875ef7296da8015ae7a1d (patch)
tree7539796b9378fc973e3d04f9c0ece6beec012713
parente7a7f329affce3776a322ae16cea315d6d8ffa1a (diff)
downloadusdx-676e81e88faea63c163875ef7296da8015ae7a1d.tar.gz
usdx-676e81e88faea63c163875ef7296da8015ae7a1d.tar.xz
usdx-676e81e88faea63c163875ef7296da8015ae7a1d.zip
As sdl_ttf isn't of any use for now, I uncommented all occurrences of it.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1195 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--Game/Code/Classes/TextGL.pas2
-rw-r--r--Game/Code/Classes/UMain.pas14
-rw-r--r--Game/Code/Classes/UTextClasses.pas2
-rw-r--r--Game/Code/UltraStar.dpr4
4 files changed, 12 insertions, 10 deletions
diff --git a/Game/Code/Classes/TextGL.pas b/Game/Code/Classes/TextGL.pas
index 2e186793..3521c5be 100644
--- a/Game/Code/Classes/TextGL.pas
+++ b/Game/Code/Classes/TextGL.pas
@@ -17,7 +17,7 @@ uses
SDL,
UTexture,
Classes,
- SDL_ttf,
+// SDL_ttf,
ULog;
procedure BuildFont; // build our bitmap font
diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index d045ee34..d9440144 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -125,7 +125,7 @@ uses
math,
UCommandLine,
ULanguage,
- SDL_ttf,
+// SDL_ttf,
USkins,
UCovers,
UCatCovers,
@@ -194,11 +194,11 @@ begin
Log.LogBenchmark('Loading Language', 1);
// SDL_ttf
- Log.BenchmarkStart(1);
- Log.LogStatus('Initialize SDL_ttf', 'Initialization');
- TTF_Init();
- Log.BenchmarkEnd(1);
- Log.LogBenchmark('Initializing SDL_ttf', 1);
+// Log.BenchmarkStart(1);
+// Log.LogStatus('Initialize SDL_ttf', 'Initialization');
+// TTF_Init();
+// Log.BenchmarkEnd(1);
+// Log.LogBenchmark('Initializing SDL_ttf', 1);
// Skin
Log.BenchmarkStart(1);
@@ -356,7 +356,7 @@ begin
FinalizeMedia();
- TTF_Quit();
+// TTF_Quit();
SDL_Quit();
(*
diff --git a/Game/Code/Classes/UTextClasses.pas b/Game/Code/Classes/UTextClasses.pas
index fb74f34e..9a12e1f5 100644
--- a/Game/Code/Classes/UTextClasses.pas
+++ b/Game/Code/Classes/UTextClasses.pas
@@ -9,7 +9,7 @@ uses
SDL,
UTexture,
Classes,
- SDL_ttf,
+// SDL_ttf,
ULog;
{
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 12f5cc13..f021bc6a 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -10,6 +10,8 @@ program UltraStar;
{$I switches.inc}
+//{$DEFINE CONSOLE}
+
// TODO: check if this is needed for MacOSX too
{$IFDEF MSWINDOWS}
// Set global application-type (GUI/CONSOLE) switch for Windows.
@@ -44,7 +46,7 @@ uses
glext in 'lib\JEDI-SDL\OpenGL\Pas\glext.pas',
sdl in 'lib\JEDI-SDL\SDL\Pas\sdl.pas',
sdl_image in 'lib\JEDI-SDL\SDL_Image\Pas\sdl_image.pas',
- sdl_ttf in 'lib\JEDI-SDL\SDL_ttf\Pas\sdl_ttf.pas',
+// sdl_ttf in 'lib\JEDI-SDL\SDL_ttf\Pas\sdl_ttf.pas',
sdlutils in 'lib\JEDI-SDL\SDL\Pas\sdlutils.pas',
UMediaCore_SDL in 'Classes\UMediaCore_SDL.pas',