diff options
| author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2013-04-10 17:41:22 +0100 |
|---|---|---|
| committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2013-04-10 17:41:22 +0100 |
| commit | 9947e87c9ee4c59a34332d0373d972cd0d87f6e6 (patch) | |
| tree | b761ca7fc346e4d34ccde489581628e1250f2859 | |
| parent | e08f2157a91924039e3ec0c4650619212298fca1 (diff) | |
| parent | 9bef9c42b16f8fd85bca0a9c2e6268b32c5acb39 (diff) | |
| download | fpGUI-9947e87c9ee4c59a34332d0373d972cd0d87f6e6.tar.xz | |
Merge branch 'hotfix-1' into develop
| -rw-r--r-- | src/corelib/fpg_imgfmt_bmp.pas | 6 | ||||
| -rw-r--r-- | src/corelib/gdi/fpgui_toolkit.lpk | 7 | ||||
| -rw-r--r-- | src/corelib/x11/fpgui_toolkit.lpk | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/corelib/fpg_imgfmt_bmp.pas b/src/corelib/fpg_imgfmt_bmp.pas index ff354898..00637f3b 100644 --- a/src/corelib/fpg_imgfmt_bmp.pas +++ b/src/corelib/fpg_imgfmt_bmp.pas @@ -38,6 +38,12 @@ implementation uses fpg_utils; +{$IF FPC_FULLVERSION<20602} +type + uint16 = word; + uint32 = cardinal; +{$IFEND} + procedure ReadImage_OS2BMP(img: TfpgImage; bmp: Pointer; bmpsize: longword); forward; diff --git a/src/corelib/gdi/fpgui_toolkit.lpk b/src/corelib/gdi/fpgui_toolkit.lpk index f3f349c3..bf019e5f 100644 --- a/src/corelib/gdi/fpgui_toolkit.lpk +++ b/src/corelib/gdi/fpgui_toolkit.lpk @@ -1,12 +1,11 @@ <?xml version="1.0"?> <CONFIG> - <Package Version="3"> + <Package Version="4"> <PathDelim Value="\"/> <Name Value="fpgui_toolkit"/> - <AddToProjectUsesSection Value="False"/> <Author Value="Graeme Geldenhuys"/> <CompilerOptions> - <Version Value="9"/> + <Version Value="11"/> <PathDelim Value="\"/> <SearchPaths> <IncludeFiles Value="..\..;..\render\software"/> @@ -31,7 +30,7 @@ </CompilerOptions> <Description Value="fpGUI Toolkit"/> <License Value="LGPL 2 with static linking exception."/> - <Version Minor="8"/> + <Version Major="1"/> <Files Count="98"> <Item1> <Filename Value="..\stdimages.inc"/> diff --git a/src/corelib/x11/fpgui_toolkit.lpk b/src/corelib/x11/fpgui_toolkit.lpk index 2ac5a337..c769331e 100644 --- a/src/corelib/x11/fpgui_toolkit.lpk +++ b/src/corelib/x11/fpgui_toolkit.lpk @@ -28,7 +28,7 @@ </CompilerOptions> <Description Value="fpGUI Toolkit"/> <License Value="LGPL 2 with static linking exception."/> - <Version Minor="8"/> + <Version Major="1"/> <Files Count="99"> <Item1> <Filename Value="../stdimages.inc"/> |