aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Classes/TextGL.pas
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-04-06 11:36:03 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-04-06 11:36:03 +0000
commitb2a824d8f4fcf4d9038e2a360ac586fb0279e739 (patch)
tree79c473600e6ada136c7b2e63c8725565f8c4c521 /Game/Code/Classes/TextGL.pas
parentda94f9cb1798038b5bbf898b1a92ab03c3a1628e (diff)
downloadusdx-b2a824d8f4fcf4d9038e2a360ac586fb0279e739.tar.gz
usdx-b2a824d8f4fcf4d9038e2a360ac586fb0279e739.tar.xz
usdx-b2a824d8f4fcf4d9038e2a360ac586fb0279e739.zip
removed lazarus dependencies
- added an implementation of AllocateHWnd/DeallocateHWnd to UCommon for the Win32 only units DirWatch and Midi... (do not use AllocateHWnd somewhere else) - added an own implementation of ShowMessage to UCommon (uses MessageBox in Windows, console-output otherwise) - linux still needs lresources for the lrs-file (will be removed soon) - the FPC windows version uses windows resources now (instead of lrs ones). compile them with windres (in FPC's "bin" dir) or delphi (a batch-file for windres will follow soon) - changed path-separator from '\' to '/' in RC-file for windres compatibility git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1006 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/Classes/TextGL.pas7
1 files changed, 3 insertions, 4 deletions
diff --git a/Game/Code/Classes/TextGL.pas b/Game/Code/Classes/TextGL.pas
index 9d9a4be7..c4399a7a 100644
--- a/Game/Code/Classes/TextGL.pas
+++ b/Game/Code/Classes/TextGL.pas
@@ -14,7 +14,6 @@ uses
SDL,
UTexture,
Classes,
- dialogs,
SDL_ttf,
ULog;
@@ -78,7 +77,7 @@ uses
UMain,
UCommon,
SysUtils,
- {$IFDEF LAZARUS}
+ {$IFDEF LCL}
LResources,
{$ENDIF}
{$IFDEF DARWIN}
@@ -89,7 +88,7 @@ uses
procedure BuildFont; // Build Our Bitmap Font
procedure loadfont( aID : integer; aType, aResourceName : String);
- {$IFDEF LAZARUS}
+ {$IFDEF LCL}
var
lLazRes : TLResource;
lResData : TStringStream;
@@ -106,7 +105,6 @@ procedure BuildFont; // Build Our Bitmap Font
freeandnil( lResData );
end;
end;
-
{$ELSE}
var
Reg: TResourceStream;
@@ -387,6 +385,7 @@ begin
begin
Log.LogStatus('ERROR Could not find font in ' + FileName , '');
ShowMessage( 'ERROR Could not find font in ' + FileName );
+ Result := nil;
end;
end;