aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Classes/UTexture.pas
diff options
context:
space:
mode:
authoreddie-0815 <eddie-0815@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-11-01 19:34:40 +0000
committereddie-0815 <eddie-0815@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-11-01 19:34:40 +0000
commit391d30716d48dc709f6444b19c008e82311623b9 (patch)
treee922181e99262c06e6d48a6df5cda71a2338e0bd /Game/Code/Classes/UTexture.pas
parent39c1fdef33f512a36334e689e38b90cfe4aceb82 (diff)
downloadusdx-391d30716d48dc709f6444b19c008e82311623b9.tar.gz
usdx-391d30716d48dc709f6444b19c008e82311623b9.tar.xz
usdx-391d30716d48dc709f6444b19c008e82311623b9.zip
Mac OS X version compiles and links. I hope I didn't break too many files on windows/linux.
Added switches.inc to all files. Changed many IFDEFs. For Windows-only code please use MSWINDOWS instead of WIN32 now. WIN32 is also used by the Mac port. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@546 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Classes/UTexture.pas')
-rw-r--r--Game/Code/Classes/UTexture.pas12
1 files changed, 4 insertions, 8 deletions
diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas
index 5ef29316..76d78f5b 100644
--- a/Game/Code/Classes/UTexture.pas
+++ b/Game/Code/Classes/UTexture.pas
@@ -19,10 +19,6 @@ interface
{$I switches.inc}
-{$IFDEF FPC}
- {$MODE DELPHI}
-{$ENDIF}
-
uses OpenGL12,
{$IFDEF win32}
windows,
@@ -131,7 +127,7 @@ implementation
uses ULog,
DateUtils,
UCovers,
- {$IFDEF FPC}
+ {$IFDEF LAZARUS}
LResources,
{$ENDIF}
StrUtils, dialogs;
@@ -247,7 +243,7 @@ var
TexRWops: PSDL_RWops;
dHandle: THandle;
- {$IFDEF FPC}
+ {$IFDEF LAZARUS}
lLazRes : TLResource;
lResData : TStringStream;
{$ELSE}
@@ -277,7 +273,7 @@ begin
Log.LogStatus( 'IS Resource, because file does not exist.('+Identifier+')', ' LoadImage' );
// load from resource stream
- {$IFNDEF FPC}
+ {$IFDEF WIN32}
dHandle := FindResource(hInstance, Identifier, 'TEX');
if dHandle=0 then
begin
@@ -1134,7 +1130,7 @@ begin
end;
end;
-{$IFDEF FPC}
+{$IFDEF LAZARUS}
initialization
{$I UltraStar.lrs}
{$ENDIF}