From aff95a0de81627a22330ffe57a4d2c6dd0535277 Mon Sep 17 00:00:00 2001 From: Bergmann89 Date: Fri, 29 Nov 2013 12:10:11 +0100 Subject: [PATCH] * some fixes to support Delphi (thanks at Jens01) --- glBitmap.pas | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/glBitmap.pas b/glBitmap.pas index 07317a3..b5e8f2e 100644 --- a/glBitmap.pas +++ b/glBitmap.pas @@ -242,7 +242,7 @@ unit glBitmap; {.$DEFINE GLB_DELPHI} // activate to enable the support for TLazIntfImage from Lazarus -{$DEFINE GLB_LAZARUS} +{.$DEFINE GLB_LAZARUS} @@ -254,7 +254,7 @@ unit glBitmap; // activate to enable Lazarus TPortableNetworkGraphic support // if you enable this pngImage and libPNG will be ignored -{$DEFINE GLB_LAZ_PNG} +{.$DEFINE GLB_LAZ_PNG} // activate to enable png support with the unit pngimage -> http://pngdelphi.sourceforge.net/ // if you enable pngimage the libPNG will be ignored @@ -268,7 +268,7 @@ unit glBitmap; // activate to enable Lazarus TJPEGImage support // if you enable this delphi jpegs and libJPEG will be ignored -{$DEFINE GLB_LAZ_JPEG} +{.$DEFINE GLB_LAZ_JPEG} // if you enable delphi jpegs the libJPEG will be ignored {.$DEFINE GLB_DELPHI_JPEG} @@ -443,11 +443,12 @@ interface uses {$IFNDEF GLB_NATIVE_OGL} dglOpenGL, {$ENDIF} {$IF DEFINED(GLB_WIN) AND - DEFINED(GLB_NATIVE_OGL)} windows, {$IFEND} + (DEFINED(GLB_NATIVE_OGL) OR + DEFINED(GLB_DELPHI))} windows, {$IFEND} {$IFDEF GLB_SDL} SDL, {$ENDIF} {$IFDEF GLB_LAZARUS} IntfGraphics, GraphType, Graphics, {$ENDIF} - {$IFDEF GLB_DELPHI} Dialogs, Graphics, {$ENDIF} + {$IFDEF GLB_DELPHI} Dialogs, Graphics, Types, {$ENDIF} {$IFDEF GLB_SDL_IMAGE} SDL_image, {$ENDIF} {$IFDEF GLB_PNGIMAGE} pngimage, {$ENDIF} @@ -1224,7 +1225,8 @@ function CreateGrayPalette: HPALETTE; implementation uses - Math, syncobjs, typinfo; + Math, syncobjs, typinfo + {$IFDEF GLB_DELPHI}, Types{$ENDIF}; type {$IFNDEF fpc} -- 2.1.4