From 0f7202f0741abc443d087b1c7d0e03ede9114fdc Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 8 Mar 1998 18:52:15 -0600 Subject: [PATCH] Imported from libpng-1.0.0.tar --- CHANGES | 3 +++ INSTALL | 10 ++++++---- README | 8 +++++--- example.c | 10 +++++----- libpng.3 | 10 +++++----- libpng.txt | 2 +- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 6 +++--- png.h | 14 +++++++------- pngconf.h | 4 ++-- pngerror.c | 4 ++-- pngget.c | 4 ++-- pngmem.c | 4 ++-- pngpread.c | 4 ++-- pngread.c | 4 ++-- pngrio.c | 4 ++-- pngrtran.c | 4 ++-- pngrutil.c | 4 ++-- pngset.c | 4 ++-- pngtest.c | 4 ++-- pngtrans.c | 4 ++-- pngwio.c | 4 ++-- pngwrite.c | 4 ++-- pngwtran.c | 4 ++-- pngwutil.c | 4 ++-- scripts/SCOPTIONS.ppc | 7 +++++++ scripts/makefile.lnx | 2 +- scripts/makefile.s2x | 2 +- scripts/makefile.tc3 | 11 ++++------- scripts/makefile.wat | 4 ++-- scripts/smakefile.ppc | 29 +++++++++++++++++++++++++++++ 32 files changed, 113 insertions(+), 73 deletions(-) create mode 100644 scripts/SCOPTIONS.ppc create mode 100644 scripts/smakefile.ppc diff --git a/CHANGES b/CHANGES index 19a728fa..d03810da 100644 --- a/CHANGES +++ b/CHANGES @@ -268,3 +268,6 @@ version 1.00 [March 7, 1998] changed some typedefs (s_start, etc.) in pngrutil.c fixed dimensions of "short_months" array in pngwrite.c Replaced ansi2knr.c with the one from jpeg-v6 +version 1.0.0 [March 8, 1998] + Changed name from 1.00 to 1.0.0 (Adam Costello) + Added smakefile.ppc (with SCOPTIONS.ppc) for Amiga PPC (Andreas Kleinert) diff --git a/INSTALL b/INSTALL index a14e1acb..6df4c0be 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.00 March 7, 1998 +Installing libpng version 1.0.0 March 8, 1998 Before installing libpng, you must first install zlib. zlib can usually be found wherever you got libpng. zlib can be @@ -10,7 +10,7 @@ zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.00 or "lpng100" and "zlib-1.1.1" +might be called "libpng-1.0.0 or "lpng100" and "zlib-1.1.1" or "zlib111") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -44,11 +44,13 @@ include makefile.dec => DEC Alpha UNIX makefile makefile.sgi => Silicon Graphics IRIX makefile makefile.sun => Sun makefile - makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.00) - makefile.lnx => Linux/ELF makefile (gcc, creates libpng.so.2.1.00) + makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0) + makefile.lnx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0) makefile.mip => MIPS makefile makefile.aco => Acorn makefile makefile.ama => Amiga makefile + smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler + (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc) makefile.atr => Atari makefile makefile.bor => Borland makefile build.bat => MS-DOS batch file for Borland compiler diff --git a/README b/README index 4390f6a4..50917071 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng 1.00 (shared library 2.1) +README for libpng 1.0.0 (shared library 2.1) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -161,11 +161,13 @@ Files in this distribution: makefile.dec => DEC Alpha UNIX makefile makefile.sgi => Silicon Graphics IRIX makefile makefile.sun => Sun makefile - makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.00) - makefile.lnx => Linux/ELF makefile (gcc, creates libpng.so.2.1.00) + makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0) + makefile.lnx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0) makefile.mip => MIPS makefile makefile.aco => Acorn makefile makefile.ama => Amiga makefile + smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler + (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc) makefile.atr => Atari makefile makefile.bor => Borland makefile build.bat => MS-DOS batch file for Borland compiler diff --git a/example.c b/example.c index f984067c..bc86aed6 100644 --- a/example.c +++ b/example.c @@ -15,7 +15,7 @@ #include "png.h" -/* Check to see if a file is a PNG file using png_check_sig(). Returns +/* Check to see if a file is a PNG file using png_sig_cmp(). Returns * non-zero if the image is a PNG, and 0 if it isn't a PNG. * * If this call is successful, and you are going to keep the file open, @@ -29,7 +29,7 @@ * * Many applications already read the first 2 or 4 bytes from the start * of the image to determine the file type, so it would be easiest just - * to pass the bytes to png_check_sig() or even skip that if you know + * to pass the bytes to png_sig_cmp() or even skip that if you know * you have a PNG file, and call png_set_sig_bytes(). */ #define PNG_BYTES_TO_CHECK 4 @@ -46,7 +46,7 @@ int check_if_png(char *file_name, FILE **fp) return 0; /* Compare the first PNG_BYTES_TO_CHECK bytes of the signature. */ - return(png_check_sig(buf, PNG_BYTES_TO_CHECK)); + return(png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK)); } /* Read a PNG file. You may want to return an error code if the read @@ -92,7 +92,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ } /* Allocate/initialize the memory for image information. REQUIRED. */ - info_ptr = png_create_info_struct(); + info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { fclose(fp); @@ -127,7 +127,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ #endif no_streams /* Use only one I/O method! */ /* If we have already read some of the signature */ - png_set_sig_bytes_read(png_ptr, sig_read); + png_set_sig_bytes(png_ptr, sig_read); /* The call to png_read_info() gives us all of the information from the * PNG file before the first IDAT (image data chunk). REQUIRED diff --git a/libpng.3 b/libpng.3 index b5269d72..a62d7fe5 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 7, 1998" +.TH LIBPNG 3 "March 8, 1998" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library .SH SYNOPSIS @@ -396,7 +396,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.00 March 7, 1998 + libpng version 1.0.0 March 8, 1998 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998, Glenn Randers-Pehrson @@ -2306,8 +2306,8 @@ the first widely used release: 0.97c 0.97 2.0.97 0.98 0.98 2.0.98 0.99 0.99 2.0.99 - 0.99a-g 0.99 2.0.99 - 1.0 1.00 2.1.0 + 0.99a-m 0.99 2.0.99 + 1.0.0 1.00 2.1.0 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -2365,7 +2365,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.00 (March 7, 1998): +Libpng version 1.0.0 (March 8, 1998): Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alumni.rpi.edu). diff --git a/libpng.txt b/libpng.txt index 3740fbe5..6ce69ed4 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.00 March 7, 1998 + libpng version 1.0.0 March 8, 1998 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998, Glenn Randers-Pehrson diff --git a/libpngpf.3 b/libpngpf.3 index 082c47eb..d187aad0 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "March 7, 1998" +.TH LIBPNGPF 3 "March 8, 1998" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library (private functions) diff --git a/png.5 b/png.5 index 49d6959c..d55b3a0b 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 7, 1998" +.TH PNG 5 "March 8, 1998" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index bbbf8e48..0eff1a0f 100644 --- a/png.c +++ b/png.c @@ -1,12 +1,12 @@ /* png.c - location for general purpose libpng functions * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 */ #define PNG_INTERNAL @@ -16,7 +16,7 @@ /* Version information for C files. This had better match the version * string defined in png.h. */ -char png_libpng_ver[5] = "1.00"; +char png_libpng_ver[6] = "1.0.0"; /* Place to hold the signature string for a PNG file. */ png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10}; diff --git a/png.h b/png.h index 899294db..af7a39bd 100644 --- a/png.h +++ b/png.h @@ -1,12 +1,12 @@ /* png.h - header file for PNG reference library * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see the COPYRIGHT NOTICE below. * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998 Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * Note about libpng version numbers: * @@ -27,8 +27,8 @@ * 0.97c 0.97 2.0.97 * 0.98 0.98 2.0.98 * 0.99 0.99 2.0.99 - * 0.99a-i 0.99 2.0.99 - * 1.00 1.00 2.1.0 + * 0.99a-m 0.99 2.0.99 + * 1.0.0 1.00 2.1.0 * * Henceforth the source version will match the shared-library minor * and patch numbers; the shared-library major version number will be @@ -112,10 +112,10 @@ extern "C" { */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.00" +#define PNG_LIBPNG_VER_STRING "1.0.0" /* careful here. At one time, I wanted to use 082, but that would be octal. - * Version 1.0 will be 100 here, etc. + * Version 1.0.0 will be 100 here, etc. */ #define PNG_LIBPNG_VER 100 @@ -124,7 +124,7 @@ extern "C" { /* Version information for C files, stored in png.c. This had better match * the version above. */ -extern char png_libpng_ver[5]; +extern char png_libpng_ver[6]; /* Structures to facilitate easy interlacing. See png.c for more details */ extern int FARDATA png_pass_start[7]; diff --git a/pngconf.h b/pngconf.h index 6d0adb1a..a10650d4 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,12 +1,12 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 */ /* Any machine specific code is near the front of this file, so if you diff --git a/pngerror.c b/pngerror.c index 98d5930b..98827a90 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,12 +1,12 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * This file provides a location for all error handling. Users which * need special error handling are expected to write replacement functions diff --git a/pngget.c b/pngget.c index 6296589d..0ae1eb77 100644 --- a/pngget.c +++ b/pngget.c @@ -1,12 +1,12 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 */ #define PNG_INTERNAL diff --git a/pngmem.c b/pngmem.c index 5099920d..e43474b0 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,12 +1,12 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * This file provides a location for all memory allocation. Users which * need special memory handling are expected to modify the code in this file diff --git a/pngpread.c b/pngpread.c index 1723fd11..47ece54e 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,12 +1,12 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 */ #define PNG_INTERNAL diff --git a/pngread.c b/pngread.c index b1a1f8e6..cd17bca4 100644 --- a/pngread.c +++ b/pngread.c @@ -1,12 +1,12 @@ /* pngread.c - read a PNG file * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * This file contains routines that an application calls directly to * read a PNG file or stream. diff --git a/pngrio.c b/pngrio.c index 5d6682cb..4623820b 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,12 +1,12 @@ /* pngrio.c - functions for data input * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * This file provides a location for all input. Users which need * special handling are expected to write a function which has the same diff --git a/pngrtran.c b/pngrtran.c index adc84dd6..88ab9028 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,12 +1,12 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * This file contains functions optionally called by an application * in order to tell libpng how to handle data when reading a PNG. diff --git a/pngrutil.c b/pngrutil.c index a21a03fd..ea5b26ae 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,12 +1,12 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 0.99 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * This file contains routines which are only called from within * libpng itself during the course of reading an image. diff --git a/pngset.c b/pngset.c index 9ccb1088..957e0d7a 100644 --- a/pngset.c +++ b/pngset.c @@ -1,12 +1,12 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * The functions here are used during reads to store data from the file * into the info struct, and during writes to store application data diff --git a/pngtest.c b/pngtest.c index e1a3ea07..568d21e9 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,12 +1,12 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * This program reads in a PNG image, writes it out again, and then * compares the two files. If the files are identical, this shows that diff --git a/pngtrans.c b/pngtrans.c index d67afa8e..7d8a5b2f 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,12 +1,12 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 */ #define PNG_INTERNAL diff --git a/pngwio.c b/pngwio.c index c8879ef5..676cc2f4 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,12 +1,12 @@ /* pngwio.c - functions for data output * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 * * This file provides a location for all output. Users which need * special handling are expected to write functions which have the same diff --git a/pngwrite.c b/pngwrite.c index 1a923223..1cdc9c39 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,12 +1,12 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 */ /* get internal access to png.h */ diff --git a/pngwtran.c b/pngwtran.c index 25a2d64b..0effc397 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,12 +1,12 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 */ #define PNG_INTERNAL diff --git a/pngwutil.c b/pngwutil.c index 04fb1de3..459c932b 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,12 +1,12 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.00 + * libpng 1.0.0 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. * Copyright (c) 1996, 1997 Andreas Dilger * Copyright (c) 1998, Glenn Randers-Pehrson - * March 7, 1998 + * March 8, 1998 */ #define PNG_INTERNAL diff --git a/scripts/SCOPTIONS.ppc b/scripts/SCOPTIONS.ppc new file mode 100644 index 00000000..2c3503e9 --- /dev/null +++ b/scripts/SCOPTIONS.ppc @@ -0,0 +1,7 @@ +OPTIMIZE +OPTPEEP +OPTTIME +OPTSCHED +AUTOREGISTER +PARMS=REGISTERS +INCLUDEDIR=hlp:ppc/include diff --git a/scripts/makefile.lnx b/scripts/makefile.lnx index 851eb821..3d1a76a4 100644 --- a/scripts/makefile.lnx +++ b/scripts/makefile.lnx @@ -24,7 +24,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.00 +PNGMIN = 1.0 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a, libpng.so*, and png.h diff --git a/scripts/makefile.s2x b/scripts/makefile.s2x index 48055b6f..0503890a 100644 --- a/scripts/makefile.s2x +++ b/scripts/makefile.s2x @@ -23,7 +23,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.00 +PNGMIN = 1.0 PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a, libpng.so*, and png.h diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3 index 03da1849..6f8f3666 100644 --- a/scripts/makefile.tc3 +++ b/scripts/makefile.tc3 @@ -14,15 +14,12 @@ O=.obj E=.exe # variables -OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) -pngwutil$(O) +OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O) OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) OBJSL1 = +png$(O) +pngset$(O) +pngget$(O) +pngrutil$(O) +pngtrans$(O) -OBJSL2 = +pngwutil$(O) +pngmem$(O) +pngpread$(O) +pngread$(O) -+pngerror$(O) -OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) -+pngwio$(O) +OBJSL2 = +pngwutil$(O) +pngmem$(O) +pngpread$(O) +pngread$(O) +pngerror$(O) +OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) +pngwio$(O) all: libpng.lib pngtest.exe @@ -82,4 +79,4 @@ libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3) pngtest$(E): pngtest$(O) libpng.lib $(CC) $(LDFLAGS) pngtest.obj libpng.lib zlib.lib -# End of makefile for libpng \ No newline at end of file +# End of makefile for libpng diff --git a/scripts/makefile.wat b/scripts/makefile.wat index 761aad5b..a715acbc 100644 --- a/scripts/makefile.wat +++ b/scripts/makefile.wat @@ -1,5 +1,5 @@ # Makefile for libpng -# Watcom 10a+ 32-bit protected mode flat memory model +# Watcom 10a and later 32-bit protected mode flat memory model # Adapted by Pawel Mrochen, based on makefile.msc # For conditions of distribution and use, see copyright notice in png.h @@ -7,7 +7,7 @@ # To use, do "wmake -f makefile.wat" -# ------------- Watcom 10a+ ------------- +# ------------- Watcom 10a and later ------------- MODEL=-mf CFLAGS= $(MODEL) -fpi87 -fp5 -5r -oaeilmnrt -s -zp4 -i=..\zlib CC=wcc386 diff --git a/scripts/smakefile.ppc b/scripts/smakefile.ppc new file mode 100644 index 00000000..fa3cad44 --- /dev/null +++ b/scripts/smakefile.ppc @@ -0,0 +1,29 @@ +# Amiga powerUP (TM) Makefile +# makefile for libpng and SAS C V6.58/7.00 PPC compiler +# Copyright (C) 1998 by Andreas R. Kleinert + +CC = scppc +CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL IDIR /zlib \ + OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8 +LIBNAME = libpng.a +AR = ppc-amigaos-ar +AR_FLAGS = cr +RANLIB = ppc-amigaos-ranlib +LDFLAGS = -r -o +LDLIBS = ../zlib/libzip.a LIB:scppc.a +LN = ppc-amigaos-ld +RM = delete quiet +MKDIR = makedir + +OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o pngread.o \ +pngerror.o pngpread.o pngwrite.o pngrtran.o pngwtran.o pngrio.o pngwio.o pngmem.o + +all: $(LIBNAME) pngtest + +$(LIBNAME): $(OBJS) + $(AR) $(AR_FLAGS) $@ $(OBJS) + $(RANLIB) $@ + +pngtest: pngtest.o $(LIBNAME) + $(LN) $(LDFLAGS) pngtest LIB:c_ppc.o pngtest.o $(LIBNAME) $(LDLIBS) \ +LIB:end.o