diff options
| author | eddie-0815 <eddie-0815@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-11-01 19:34:40 +0000 |
|---|---|---|
| committer | eddie-0815 <eddie-0815@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-11-01 19:34:40 +0000 |
| commit | 391d30716d48dc709f6444b19c008e82311623b9 (patch) | |
| tree | e922181e99262c06e6d48a6df5cda71a2338e0bd /Game/Code/Classes/TextGL.pas | |
| parent | 39c1fdef33f512a36334e689e38b90cfe4aceb82 (diff) | |
| download | usdx-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 '')
| -rw-r--r-- | Game/Code/Classes/TextGL.pas | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Game/Code/Classes/TextGL.pas b/Game/Code/Classes/TextGL.pas index fbe9a050..af60c4ff 100644 --- a/Game/Code/Classes/TextGL.pas +++ b/Game/Code/Classes/TextGL.pas @@ -2,9 +2,7 @@ unit TextGL; interface -{$IFDEF FPC} - {$MODE Delphi} -{$ENDIF} +{$I switches.inc} uses OpenGL12, @@ -80,7 +78,7 @@ uses UMain, lcltype, {$ENDIF} SysUtils, - {$IFDEF FPC} + {$IFDEF LAZARUS} LResources, {$ENDIF} UGraphic; @@ -88,7 +86,7 @@ uses UMain, procedure BuildFont; // Build Our Bitmap Font procedure loadfont( aID : integer; aType, aResourceName : String); - {$IFDEF FPC} + {$IFDEF LAZARUS} var lLazRes : TLResource; lResData : TStringStream; @@ -541,7 +539,7 @@ begin end; -{$IFDEF FPC} +{$IFDEF LAZARUS} {$IFDEF win32} initialization {$I UltraStar.lrs} |