diff options
author | jaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-09-19 11:44:10 +0000 |
---|---|---|
committer | jaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-09-19 11:44:10 +0000 |
commit | 62c82114318ed04ce42617fa9ce2e179834dbda4 (patch) | |
tree | 65bf831fa62613baa778fd1413b3c0220fe951fb /Game/Code/Menu | |
parent | 433a1b7339e2bf96f3b0bb4c98b8c799c6540027 (diff) | |
download | usdx-62c82114318ed04ce42617fa9ce2e179834dbda4.tar.gz usdx-62c82114318ed04ce42617fa9ce2e179834dbda4.tar.xz usdx-62c82114318ed04ce42617fa9ce2e179834dbda4.zip |
added UCommon ( in classes ) for lazarus...
common functions needed for lazarus ( and others ) can be put in here.
also this now compiles on lazarus..
( dosnt link yet... but I dont get any critical compiler errors )
tested to compile in my delphi, and basic functionality is fine.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@395 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | Game/Code/Menu/UDisplay.pas | 20 | ||||
-rw-r--r-- | Game/Code/Menu/UMenu.pas | 7 |
2 files changed, 21 insertions, 6 deletions
diff --git a/Game/Code/Menu/UDisplay.pas b/Game/Code/Menu/UDisplay.pas index 6ad01406..160e8a73 100644 --- a/Game/Code/Menu/UDisplay.pas +++ b/Game/Code/Menu/UDisplay.pas @@ -2,7 +2,15 @@ unit UDisplay; interface
-uses Windows, SDL, UMenu, OpenGL12, SysUtils;
+{$IFDEF FPC}
+ {$MODE Delphi}
+{$ENDIF}
+
+uses Windows,
+ SDL,
+ UMenu,
+ OpenGL12,
+ SysUtils;
type
TDisplay = class
@@ -53,10 +61,12 @@ var implementation
uses
- {$IFNDEF FPC}
- Graphics,
+ {$IFDEF FPC}
+ lazjpeg,
+ {$ELSE}
JPEG,
{$ENDIF}
+ graphics,
TextGL,
// UFiles,
UMain,
@@ -320,8 +330,8 @@ begin end;
glReadPixels(0, 0, ScreenW, ScreenH, GL_RGBA, GL_UNSIGNED_BYTE, @PrintScreenData[0]);
- Bitmap := TBitmap.Create;
- Bitmap.Width := ScreenW;
+ Bitmap := TBitmap.Create;
+ Bitmap.Width := ScreenW;
Bitmap.Height := ScreenH;
for Y := 0 to ScreenH-1 do
diff --git a/Game/Code/Menu/UMenu.pas b/Game/Code/Menu/UMenu.pas index 3c50967d..1e6c1e87 100644 --- a/Game/Code/Menu/UMenu.pas +++ b/Game/Code/Menu/UMenu.pas @@ -154,7 +154,12 @@ const implementation
-uses UMain, UDrawTexture, UGraphic, UDisplay, UCovers, USkins, Dialogs;
+uses UMain,
+ UDrawTexture,
+ UGraphic,
+ UDisplay,
+ UCovers,
+ USkins;
destructor TMenu.Destroy;
begin
|