diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-12-04 08:40:41 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-12-04 08:40:41 -0600 |
| commit | 03f9b0295366daa5a0b0754c69d8d0db5294865b (patch) | |
| tree | c22b28a9038258a49f3d200dfce82eb46cf5d18b | |
| parent | ce96c3e6b7eef3d3bea65ed87df53594c1234dc0 (diff) | |
| download | libpng-03f9b0295366daa5a0b0754c69d8d0db5294865b.tar.gz | |
[devel] Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects.
and added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files.
63 files changed, 103 insertions, 82 deletions
@@ -1,5 +1,5 @@ -Libpng 1.4.0beta107 - November 27, 2009 +Libpng 1.4.0beta107 - December 4, 2009 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -709,16 +709,19 @@ version 1.4.0beta104 [November 22, 2009] Rebuilt configure scripts with autoconf-2.65 version 1.4.0beta105 [November 25, 2009] - Use fast integer PNG_DIVIDE_BY_255() or PNG_DIVIDE_BY_65535() to accomplish - alpha premultiplication when PNG_READ_COMPOSITE_NODIV_SUPPORTED is defined. + Use fast integer PNG_DIVIDE_BY_255() or PNG_DIVIDE_BY_65535() + to accomplish alpha premultiplication when + PNG_READ_COMPOSITE_NODIV_SUPPORTED is defined. Changed "/255" to "/255.0" in background calculations to make it clear that the 255 is used as a double. version 1.4.0beta106 [November 27, 2009] Removed premultiplied alpha feature. -version 1.4.0beta107 [November 27, 2009] +version 1.4.0beta107 [December 4, 2009] Updated README + Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files. + Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2396,16 +2396,19 @@ version 1.4.0beta104 [November 22, 2009] Rebuilt configure scripts with autoconf-2.65 version 1.4.0beta105 [November 25, 2009] - Use fast integer PNG_DIVIDE_BY_255() or PNG_DIVIDE_BY_65535() to accomplish - alpha premultiplication when PNG_READ_COMPOSITE_NODIV_SUPPORTED is defined. + Use fast integer PNG_DIVIDE_BY_255() or PNG_DIVIDE_BY_65535() + to accomplish alpha premultiplication when + PNG_READ_COMPOSITE_NODIV_SUPPORTED is defined. Changed "/255" to "/255.0" in background calculations to make it clear that the 255 is used as a double. version 1.4.0beta106 [November 27, 2009] Removed premultiplied alpha feature. -version 1.4.0beta107 [November 27, 2009] +version 1.4.0beta107 [December 4, 2009] Updated README + Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files. + Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * This file has been placed in the public domain by the authors. * Maintained 1998-2009 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -12,6 +12,7 @@ */ #define PNG_NO_EXTERN +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #include "pngpriv.h" @@ -547,13 +548,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.0beta107 - November 27, 2009" PNG_STRING_NEWLINE \ + "libpng version 1.4.0beta107 - December 4, 2009" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2009 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE); #else - return ((png_charp) "libpng version 1.4.0beta107 - November 27, 2009\ + return ((png_charp) "libpng version 1.4.0beta107 - December 4, 2009\ Copyright (c) 1998-2009 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0beta107 - November 27, 2009 + * libpng version 1.4.0beta107 - December 4, 2009 * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.4.0beta107 - November 27, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta107 - December 4, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -163,7 +163,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta107, November 27, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta107, December 4, 2009, are * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -339,7 +339,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.0beta107" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0beta107 - November 27, 2009\n" + " libpng version 1.4.0beta107 - December 4, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.0beta107 - November 27, 2009 + * libpng version 1.4.0beta107 - December 4, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 1a341ae5f..64e3e4928 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -16,6 +16,7 @@ * at each function. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -12,6 +12,7 @@ * */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -17,6 +17,7 @@ * identify the replacement functions. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" diff --git a/pngpread.c b/pngpread.c index c28704955..c4dd73c94 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,6 +11,7 @@ * and license in png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_PROGRESSIVE_READ_SUPPORTED #include "pngpriv.h" @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0beta107 - November 27, 2009 + * libpng version 1.4.0beta107 - December 4, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -14,6 +14,7 @@ * read a PNG file or stream. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_READ_SUPPORTED #include "pngpriv.h" @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -18,6 +18,7 @@ * libpng use it at run time with png_set_read_fn(...). */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_READ_SUPPORTED #include "pngpriv.h" diff --git a/pngrtran.c b/pngrtran.c index 2289c238f..9e51d3b91 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -16,6 +16,7 @@ * in pngtrans.c. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_READ_SUPPORTED #include "pngpriv.h" diff --git a/pngrutil.c b/pngrutil.c index 98212bb97..aaeee0f17 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -14,6 +14,7 @@ * libpng itself during the course of reading an image. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_READ_SUPPORTED #include "pngpriv.h" @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -16,6 +16,7 @@ * info struct and allows us to change the structure in the future. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) diff --git a/pngtrans.c b/pngtrans.c index c797222f6..1c7829ad3 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,6 +11,7 @@ * and license in png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -18,6 +18,7 @@ * them at run time with png_set_write_fn(...). */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_WRITE_SUPPORTED #include "pngpriv.h" diff --git a/pngwrite.c b/pngwrite.c index 110ee1fe5..def94b290 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -12,6 +12,7 @@ */ /* Get internal access to png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_WRITE_SUPPORTED #include "pngpriv.h" diff --git a/pngwtran.c b/pngwtran.c index 515193390..7ba8f9f1a 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,6 +11,7 @@ * and license in png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_WRITE_SUPPORTED #include "pngpriv.h" diff --git a/pngwutil.c b/pngwutil.c index b507370d2..cd0a66eb6 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,6 +11,7 @@ * and license in png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_WRITE_SUPPORTED #include "pngpriv.h" diff --git a/scripts/README.txt b/scripts/README.txt index e12fc58fc..c03996373 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.4.0beta107 - November 27, 2009 +Makefiles for libpng version 1.4.0beta107 - December 4, 2009 makefile.linux => Linux/ELF makefile (gcc, creates libpng14.so.14.1.4.0beta107) diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 90f539784..b43053256 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -49,7 +49,7 @@ ZLIBINC=/usr/include WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) $(SUN_CC_FLAGS) \ +CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 545314eb4..d593b4c69 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -49,7 +49,7 @@ ZLIBINC=/usr/include WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) $(SUN_CC_FLAGS) \ +CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm diff --git a/scripts/makefile.acorn b/scripts/makefile.acorn index e2630d733..a0e577b24 100644 --- a/scripts/makefile.acorn +++ b/scripts/makefile.acorn @@ -2,7 +2,7 @@ # Toolflags: -CCflags = -DPNG_CONFIGURE_LIBPNG -c -depend !Depend -IC:,Zlib: -g -throwback -DRISCOS -fnah +CCflags = -c -depend !Depend -IC:,Zlib: -g -throwback -DRISCOS -fnah C++flags = -c -depend !Depend -IC: -throwback Linkflags = -aif -c++ -o $@ ObjAsmflags = -throwback -NoCache -depend !Depend diff --git a/scripts/makefile.aix b/scripts/makefile.aix index a97bd4b13..6b8da313f 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -48,7 +48,7 @@ LDDEBUG = CRELEASE = -O2 LDRELEASE = -s WARNMORE=-W -Wall -CFLAGS = -DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) +CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) LDFLAGS = -L. -L$(ZLIBLIB) -lpng14 -lz -lm $(LDRELEASE) # File extensions diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga index 6a64260ac..8bf0f455f 100644 --- a/scripts/makefile.amiga +++ b/scripts/makefile.amiga @@ -15,7 +15,7 @@ CC=sc #compiler flags # WARNING: a bug in V6.51 causes bad code with OPTGO # So use V6.55 or set NOOPTGO!!!!!!!!! -CFLAGS= -DPNG_CONFIGURE_LIBPNG NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\ +CFLAGS= NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\ OPTLOOP OPTRDEP=4 OPTDEP=4 OPTCOMP=4 INCLUDEDIR=$(ZLIB) \ DEFINE=PNG_INTERNAL #linker flags diff --git a/scripts/makefile.atari b/scripts/makefile.atari index d26552486..0e1ca72cf 100644 --- a/scripts/makefile.atari +++ b/scripts/makefile.atari @@ -9,7 +9,7 @@ # Modified for LC56/ATARI assumes libz.lib is in same dir and uses default # rules for library management # -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I..\zlib -O +CFLAGS=-I..\zlib -O LBR = png.lib LDFLAGS=-lpng -lz -lm diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32 index 9e85f13a1..2020e6e75 100644 --- a/scripts/makefile.bc32 +++ b/scripts/makefile.bc32 @@ -43,7 +43,7 @@ LDEBUG=$(LDEBUG) -N # -d merge duplicate strings # -k- turn off standard stack frame # -w display all warnings -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG) +CFLAGS=-I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG) # -M generate map file LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG) diff --git a/scripts/makefile.beos b/scripts/makefile.beos index f40040f61..d06798747 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # On BeOS, -O1 is actually better than -O3. This is a known bug but it's # still here in R4.5 -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O1 -funroll-loops \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 # LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz diff --git a/scripts/makefile.bor b/scripts/makefile.bor index 8029dbed8..dcc3c633c 100644 --- a/scripts/makefile.bor +++ b/scripts/makefile.bor @@ -51,7 +51,7 @@ LDEBUG=$(LDEBUG) -N # -w set all warnings on # -O2 optimize for speed # -Z global optimization -CFLAGS=-DPNG_CONFIGURE_LIBPNG -O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG) +CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG) # -M generate map file LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG) diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc index 37114a3d1..5b023df94 100644 --- a/scripts/makefile.cegcc +++ b/scripts/makefile.cegcc @@ -64,7 +64,7 @@ copy-src: compilation: @echo " * Compilation of $(PACKAGE)" - cd $(PACKAGE) && CPPFLAGS="$(CPPFLAGS) -DPNG_BUILD_DLL -DPNG_CONSOLE_IO_SUPPORTED -DPNG_NO_MMX_CODE -D_WIN32_WCE=0x0420" CFLAGS="$(CFLAGS) -DPNG_CONFIGURE_LIBPNG -mms-bitfields -O3 -pipe -fomit-frame-pointer" LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" ./configure --prefix=/opt/wince --host=arm-mingw32ce && make + cd $(PACKAGE) && CPPFLAGS="$(CPPFLAGS) -DPNG_BUILD_DLL -DPNG_CONSOLE_IO_SUPPORTED -DPNG_NO_MMX_CODE -D_WIN32_WCE=0x0420" CFLAGS="$(CFLAGS) -mms-bitfields -O3 -pipe -fomit-frame-pointer" LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" ./configure --prefix=/opt/wince --host=arm-mingw32ce && make copy: @echo " * Copy of binary and development files" diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 603c1df78..bcb163663 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -36,7 +36,7 @@ DESTDIR= CC=gcc ifdef MINGW -MINGW_CCFLAGS=-DPNG_CONFIGURE_LIBPNG -mno-cygwin -I/usr/include/mingw +MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw endif diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index a9a643031..9732ae5dd 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -41,8 +41,8 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f -# CFLAGS=--DPNG_CONFIGURE_LIBPNG I$(ZLIBINC) -W -Wall -O3 -funroll-loops -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O -funroll-loops +# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops +CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz INCPATH=$(prefix)/include diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 271fad7c3..cc382e166 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -57,7 +57,7 @@ DM=$(DESTDIR)$(MANPATH) ZLIBLIB=../zlib ZLIBINC=../zlib -CFLAGS=-DPNG_CONFIGURE_LIBPNG -std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 +CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2 index 86ca5c460..021e969cf 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2 @@ -13,7 +13,7 @@ INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib CC=gcc -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I../zlib -O +CFLAGS=-I../zlib -O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm RANLIB=ranlib diff --git a/scripts/makefile.elf b/scripts/makefile.elf index e69b81f44..c1a00cb4e 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -57,7 +57,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-DPNG_CONFIGURE_LIBPNG -W -Wall -D_REENTRANT -O2 \ +CFLAGS=-W -Wall -D_REENTRANT -O2 \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -lpng14 diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index f1aa61802..b31adee60 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -22,8 +22,8 @@ CDEBUG = -g -DPNG_DEBUG=5 LDDEBUG = CRELEASE = -O2 LDRELEASE = -s -#CFLAGS = -DPNG_CONFIGURE_LIBPNG -W -Wall $(CDEBUG) -CFLAGS = -DPNG_CONFIGURE_LIBPNG -W -Wall $(CRELEASE) +#CFLAGS = -W -Wall $(CDEBUG) +CFLAGS = -W -Wall $(CRELEASE) #LDFLAGS = $(LDDEBUG) LDFLAGS = $(LDRELEASE) LIBS = -lz -lm diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 2b3a29272..49f6ad4de 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -14,7 +14,7 @@ ZLIBINC=/opt/zlib/include # Note that if you plan to build a libpng shared library, zlib must also # be a shared library, which zlib's configure does not do. After running # zlib's configure, edit the appropriate lines of makefile to read: -# CFLAGS=-DPNG_CONFIGURE_LIBPNG -O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ +# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ # LDSHARED=ld -b # SHAREDLIB=libz.sl @@ -40,10 +40,10 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ +CFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP # Caution: be sure you have built zlib with the same CFLAGS. -CCFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ +CCFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 3fa55ee24..9cc9b69c4 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -56,7 +56,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 #LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 7613ca26f..f3613e3cb 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -48,9 +48,9 @@ LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man BINPATH=$(exec_prefix)/bin -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 +CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 # Caution: be sure you have built zlib with the same CFLAGS. -CCFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 +CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm # override DESTDIR= on the make install command line to easily support diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index ace5f6231..b0b445ab2 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -23,7 +23,7 @@ LD = ilink AR = ilib RM = del -CFLAGS = -DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -Mc -O2 -W3 +CFLAGS = -I$(ZLIBINC) -Mc -O2 -W3 LDFLAGS = # File extensions diff --git a/scripts/makefile.intel b/scripts/makefile.intel index 498561c09..fb705e121 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -32,7 +32,7 @@ CALLING=r # __fastcall # -------------------------------------------------------------------------- CC=icl -c -CFLAGS=-DPNG_CONFIGURE_LIBPNG -O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo +CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo LD=link LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 59bc2bcb3..75cb1b58a 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -27,7 +27,7 @@ LIBPATH=$(prefix)/lib DESTDIR= CC=cc -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I../zlib -O +CFLAGS=-I../zlib -O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm # flags for ansi2knr ANSI2KNRFLAGS= diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 7ec3f124b..a4ad08477 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -51,7 +51,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O3 -funroll-loops \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 8cea859ca..b52efb147 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -61,7 +61,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS= -DPNG_CONFIGURE_LIBPNG $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ -W -Wall -O3 $(ALIGN) -funroll-loops \ -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 diff --git a/scripts/makefile.mips b/scripts/makefile.mips index 21a9ca684..5e1040ed4 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -22,8 +22,8 @@ LIBPATH=$(prefix)/lib DESTDIR= CC=cc -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I../zlib -O -systype sysv -DSYSV -w -Dmips -#CFLAGS=-DPNG_CONFIGURE_LIBPNG -O +CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips +#CFLAGS=-O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm #RANLIB=ranlib diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 212c38f71..e74464440 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc @@ -10,7 +10,7 @@ # -------- Microsoft C 5.1 and later, does not use assembler code -------- MODEL=L -CFLAGS=-DPNG_CONFIGURE_LIBPNG -Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib +CFLAGS=-Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib #-Ox generates bad code with MSC 5.1 CC=cl LD=link diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 55c9c1d25..42c5d0522 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14 LIB= png14 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.0beta107 +SHLIB_MINOR= 1.4.0rc02 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 54f5ed731..c6f8ef8ca 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.4.0beta107 +SHLIB_MINOR= 1.4.0rc02 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 83e34b858..4db31346a 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.0beta107 +SHLIB_MINOR= 1.4.0rc02 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.os2 b/scripts/makefile.os2 index e3fd36d77..affb03c1a 100644 --- a/scripts/makefile.os2 +++ b/scripts/makefile.os2 @@ -15,7 +15,7 @@ ZLIBINC=../zlib WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=--DPNG_CONFIGURE_LIBPNG I$(ZLIBINC) -W -Wall -O6 -funroll-loops -malign-loops=2 \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O6 -funroll-loops -malign-loops=2 \ -malign-functions=2 #$(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lzdll -Zcrtdll AR=emxomfar diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 724fce415..b3efd876e 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0beta107 +PNGMIN = 1.4.0rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index ab28ee365..cef23a900 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -47,7 +47,7 @@ ZLIBINC=../zlib ABI= WARNMORE= # -g -DPNG_DEBUG=5 -CFLAGS=-DPNG_CONFIGURE_LIBPNG $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 +CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ -set_version sgi$(PNGMAJ).0 diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 369a8ab3e..4a3580eb0 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -48,8 +48,8 @@ ABI= WARNMORE=-fullwarn # Note: -KPIC is the default anyhow -#CFLAGS= -DPNG_CONFIGURE_LIBPNG $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 -CFLAGS=-DPNG_CONFIGURE_LIBPNG $(ABI) -I$(ZLIBINC) -O $(WARNMORE) +#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 +CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 0d16a6b8a..16bb55e97 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -50,8 +50,8 @@ ZLIBINC=/usr/include #WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -#CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE +#CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE +CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm INCPATH=$(prefix)/include diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 00e6bd592..b7f4aaac2 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -46,7 +46,7 @@ ZLIBINC=/usr/local/include WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm diff --git a/scripts/makefile.std b/scripts/makefile.std index 60f7c0d8b..afb885ad0 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -34,7 +34,7 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=rm -f -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 +CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index 898665c56..984379c0c 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -39,7 +39,7 @@ LN_SF=ln -f -s RANLIB=ranlib RM_F=/bin/rm -f -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5 +CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3 index eb5616952..bf6ade6d5 100644 --- a/scripts/makefile.tc3 +++ b/scripts/makefile.tc3 @@ -6,8 +6,8 @@ # ----- Turbo C 3.00 (can be modified to work with earlier versions) ----- MODEL=l -CFLAGS=-DPNG_CONFIGURE_LIBPNG -O2 -Z -m$(MODEL) -I..\zlib -#CFLAGS=-DPNG_CONFIGURE_LIBPNG -D_NO_PROTO -O2 -Z -m$(MODEL) -I..\zlib # Turbo C older than 3.00 +CFLAGS=-O2 -Z -m$(MODEL) -I..\zlib +#CFLAGS=-D_NO_PROTO -O2 -Z -m$(MODEL) -I..\zlib # Turbo C older than 3.00 CC=tcc LD=tcc LIB=tlib diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index 15a377ee5..a65f1c112 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -15,7 +15,7 @@ CC = cl LD = link AR = lib -CFLAGS = -DPNG_CONFIGURE_LIBPNG -nologo -MD -O2 -W3 -I..\zlib +CFLAGS = -nologo -MD -O2 -W3 -I..\zlib LDFLAGS = -nologo ARFLAGS = -nologo RM = del diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom index 228261d51..db4d534f4 100644 --- a/scripts/makefile.watcom +++ b/scripts/makefile.watcom @@ -36,7 +36,7 @@ CALLING=r # registers CC=wcc386 -CFLAGS=-DPNG_CONFIGURE_LIBPNG -$(CPU)$(CALLING) -fp$(CPU) -fpi87 -oneatx -mf -bt=$(OS) -i=$(ZLIBINC) -zq +CFLAGS=-$(CPU)$(CALLING) -fp$(CPU) -fpi87 -oneatx -mf -bt=$(OS) -i=$(ZLIBINC) -zq LD=wcl386 LDFLAGS=-zq |