diff options
author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-04-06 11:36:03 +0000 |
---|---|---|
committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-04-06 11:36:03 +0000 |
commit | b2a824d8f4fcf4d9038e2a360ac586fb0279e739 (patch) | |
tree | 79c473600e6ada136c7b2e63c8725565f8c4c521 /Game/Code/Classes/UTexture.pas | |
parent | da94f9cb1798038b5bbf898b1a92ab03c3a1628e (diff) | |
download | usdx-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 'Game/Code/Classes/UTexture.pas')
-rw-r--r-- | Game/Code/Classes/UTexture.pas | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas index afc62455..f9f0cc10 100644 --- a/Game/Code/Classes/UTexture.pas +++ b/Game/Code/Classes/UTexture.pas @@ -17,7 +17,6 @@ uses OpenGL12, Math, Classes, SysUtils, - Graphics, UCommon, SDL, sdlutils, @@ -132,14 +131,13 @@ uses ULog, {$ifdef LINUX} fileutil, {$endif} - {$IFDEF LAZARUS} + {$IFDEF LCL} LResources, {$ENDIF} {$IFDEF DARWIN} MacResources, {$ENDIF} - StrUtils, - dialogs; + StrUtils; const fmt_rgba: TSDL_Pixelformat = ( @@ -272,7 +270,7 @@ var TexRWops: PSDL_RWops; dHandle: THandle; - {$IFDEF LAZARUS} + {$IFDEF LCL} lLazRes : TLResource; lResData : TStringStream; {$ELSE} @@ -311,7 +309,7 @@ begin Log.LogStatus( 'IS Resource, because file does not exist.('+Identifier+')', ' LoadImage' ); // load from resource stream - {$IFDEF LAZARUS} + {$IFDEF LCL} lLazRes := LazFindResource( Identifier, 'TEX' ); if lLazRes <> nil then begin @@ -969,11 +967,11 @@ begin Exit; end; end; - Log.LogError('Unknown texture-type: ' + TypeStr, 'ParseTextureType'); + Log.LogError('Unknown texture-type: "' + TypeStr + '"', 'ParseTextureType'); Result := TEXTURE_TYPE_PLAIN; end; -{$IFDEF LAZARUS} +{$IFDEF LCL} initialization {$I UltraStar.lrs} {$ENDIF} |