From 12a7652fe6cf20441dec4aae8156978bf751861f Mon Sep 17 00:00:00 2001 From: jaybinks Date: Tue, 18 Sep 2007 10:47:12 +0000 Subject: pngimage is NOT ( yet ) lazarus compatible It might compile, however the object files are in borland obj format to use this, it will need to be in GCC object file format format Or we can use the lazarus / freepascal png unit if we decide that pngimage IS required ( and we cant use the lazarus unit ) then we should investigate how this developer went with the port. http://www.lazarus.freepascal.org/index.php?name=PNphpBB2&file=viewtopic&t=3206 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@388 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/PngImage/pngzlib.pas | 41 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'Game/Code/lib/PngImage/pngzlib.pas') diff --git a/Game/Code/lib/PngImage/pngzlib.pas b/Game/Code/lib/PngImage/pngzlib.pas index 12324f2c..3155946a 100644 --- a/Game/Code/lib/PngImage/pngzlib.pas +++ b/Game/Code/lib/PngImage/pngzlib.pas @@ -6,6 +6,10 @@ unit pngzlib; +{$IFDEF FPC} + {$MODE DELPHI} +{$ENDIF} + interface type @@ -35,14 +39,12 @@ type reserved: Integer; // reserved for future use end; -function inflateInit_(var strm: TZStreamRec; version: PChar; - recsize: Integer): Integer; forward; -function inflate(var strm: TZStreamRec; flush: Integer): Integer; forward; -function inflateEnd(var strm: TZStreamRec): Integer; forward; -function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar; - recsize: Integer): Integer; forward; -function deflate(var strm: TZStreamRec; flush: Integer): Integer; forward; -function deflateEnd(var strm: TZStreamRec): Integer; forward; +function inflateInit_(var strm: TZStreamRec; version: PChar; recsize: Integer): Integer; // forward; +function inflate(var strm: TZStreamRec; flush: Integer): Integer; //forward; +function inflateEnd(var strm: TZStreamRec): Integer; //forward; +function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar; recsize: Integer): Integer; //forward; +function deflate(var strm: TZStreamRec; flush: Integer): Integer; //forward; +function deflateEnd(var strm: TZStreamRec): Integer; //forward; const zlib_version = '1.1.4'; @@ -97,15 +99,17 @@ const implementation -{$L obj\deflate.obj} -{$L obj\trees.obj} -{$L obj\inflate.obj} -{$L obj\inftrees.obj} -{$L obj\adler32.obj} -{$L obj\infblock.obj} -{$L obj\infcodes.obj} -{$L obj\infutil.obj} -{$L obj\inffast.obj} +{$IFNDef FPC} + {$L obj\deflate.obj} + {$L obj\trees.obj} + {$L obj\inflate.obj} + {$L obj\inftrees.obj} + {$L obj\adler32.obj} + {$L obj\infblock.obj} + {$L obj\infcodes.obj} + {$L obj\infutil.obj} + {$L obj\inffast.obj} +{$ENDIF} procedure _tr_init; external; procedure _tr_tally; external; @@ -146,8 +150,7 @@ function deflate(var strm: TZStreamRec; flush: Integer): Integer; external; function deflateEnd(var strm: TZStreamRec): Integer; external; // inflate decompresses data -function inflateInit_(var strm: TZStreamRec; version: PChar; - recsize: Integer): Integer; external; +function inflateInit_(var strm: TZStreamRec; version: PChar; recsize: Integer): Integer; external; function inflate(var strm: TZStreamRec; flush: Integer): Integer; external; function inflateEnd(var strm: TZStreamRec): Integer; external; function inflateReset(var strm: TZStreamRec): Integer; external; -- cgit v1.2.3