From 58c4f6b355bdcf676520989214143329c9a5cf05 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 7 Nov 2009 10:50:29 -0600 Subject: [PATCH] Added -DPNG_CONFIGURE_LIBPNG to the makefile CFLAGS to prevent warnings about direct access to png structs by libpng functions while building libpng. They need to be tested, especially those using compilers other than gcc. --- scripts/makefile.32sunu | 2 +- scripts/makefile.64sunu | 2 +- scripts/makefile.acorn | 2 +- scripts/makefile.aix | 2 +- scripts/makefile.amiga | 2 +- scripts/makefile.atari | 2 +- scripts/makefile.bc32 | 2 +- scripts/makefile.beos | 2 +- scripts/makefile.bor | 2 +- scripts/makefile.cygwin | 2 +- scripts/makefile.darwin | 4 ++-- scripts/makefile.dec | 2 +- scripts/makefile.dj2 | 2 +- scripts/makefile.elf | 2 +- scripts/makefile.freebsd | 2 +- scripts/makefile.gcc | 4 ++-- scripts/makefile.hp64 | 6 +++--- scripts/makefile.hpgcc | 2 +- scripts/makefile.hpux | 4 ++-- scripts/makefile.ibmc | 2 +- scripts/makefile.intel | 2 +- scripts/makefile.knr | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.mingw | 2 +- scripts/makefile.mips | 4 ++-- scripts/makefile.msc | 2 +- scripts/makefile.nommx | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.os2 | 2 +- scripts/makefile.sco | 2 +- scripts/makefile.sggcc | 2 +- scripts/makefile.sgi | 4 ++-- scripts/makefile.so9 | 4 ++-- scripts/makefile.solaris | 2 +- scripts/makefile.std | 2 +- scripts/makefile.sunos | 2 +- scripts/makefile.tc3 | 4 ++-- scripts/makefile.vcawin32 | 2 +- scripts/makefile.vcwin32 | 2 +- scripts/makefile.watcom | 2 +- scripts/makefile.wce | 2 +- 41 files changed, 50 insertions(+), 50 deletions(-) diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 430529b0b..517b97b4c 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=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 787d5a6f5..705b7e45b 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=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 a0e577b24..e2630d733 100644 --- a/scripts/makefile.acorn +++ b/scripts/makefile.acorn @@ -2,7 +2,7 @@ # Toolflags: -CCflags = -c -depend !Depend -IC:,Zlib: -g -throwback -DRISCOS -fnah +CCflags = -DPNG_CONFIGURE_LIBPNG -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 262cafb07..3dc6dbc37 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -48,7 +48,7 @@ LDDEBUG = CRELEASE = -O2 LDRELEASE = -s WARNMORE=-W -Wall -CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) +CFLAGS = -DPNG_CONFIGURE_LIBPNG -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 8bf0f455f..6a64260ac 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= NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\ +CFLAGS= -DPNG_CONFIGURE_LIBPNG 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 df841e597..04f4b35d5 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=-I..\zlib -O +CFLAGS=-DPNG_CONFIGURE_LIBPNG -I..\zlib -O LBR = png.lib LDFLAGS=-lpng -lz -lm diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32 index 64a3fe7f1..29d7686c9 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=-I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG) +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 88123d958..836f9d0c2 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=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \ +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 cabdf1409..696f8efe1 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=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG) +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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.cygwin b/scripts/makefile.cygwin index da2ec6869..3ec0fb330 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -36,7 +36,7 @@ DESTDIR= CC=gcc ifdef MINGW -MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw +MINGW_CCFLAGS=-DPNG_CONFIGURE_LIBPNG -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 68280f8d0..a2a6d5d83 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=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops +# CFLAGS=--DPNG_CONFIGURE_LIBPNG I$(ZLIBINC) -W -Wall -O3 -funroll-loops +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 9f5ccaa81..6aee8aba6 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -57,7 +57,7 @@ DM=$(DESTDIR)$(MANPATH) ZLIBLIB=../zlib ZLIBINC=../zlib -CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 021e969cf..86ca5c460 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2 @@ -13,7 +13,7 @@ INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib CC=gcc -CFLAGS=-I../zlib -O +CFLAGS=-DPNG_CONFIGURE_LIBPNG -I../zlib -O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm RANLIB=ranlib diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 6fd5b560d..6eefa9758 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=-W -Wall -D_REENTRANT -O2 \ +CFLAGS=-DPNG_CONFIGURE_LIBPNG -W -Wall -D_REENTRANT -O2 \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -lpng14 diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 0243c952a..2f2f1dda6 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -27,7 +27,7 @@ SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ LDADD+= -lm -lz DPADD+= ${LIBM} ${LIBZ} -CFLAGS+= -I. +CFLAGS+= -DPNG_CONFIGURE_LIBPNG -I. SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index f3365f729..ac53601aa 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -22,8 +22,8 @@ CDEBUG = -g -DPNG_DEBUG=5 LDDEBUG = CRELEASE = -O2 LDRELEASE = -s -#CFLAGS = -W -Wall $(CDEBUG) -CFLAGS = -W -Wall $(CRELEASE) +#CFLAGS = -DPNG_CONFIGURE_LIBPNG -W -Wall $(CDEBUG) +CFLAGS = -DPNG_CONFIGURE_LIBPNG -W -Wall $(CRELEASE) #LDFLAGS = $(LDDEBUG) LDFLAGS = $(LDRELEASE) LIBS = -lz -lm diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index c22b28fad..c58c1b32e 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=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ +# CFLAGS=-DPNG_CONFIGURE_LIBPNG -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=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ +CCFLAGS=-DPNG_CONFIGURE_LIBPNG -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 fd031f18c..bd1bf21e3 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=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 d6d5c4201..adfa18aa4 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=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 +CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 # Caution: be sure you have built zlib with the same CFLAGS. -CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 +CCFLAGS=-DPNG_CONFIGURE_LIBPNG -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 3b2525821..7232d8fbb 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -23,7 +23,7 @@ LD = ilink AR = ilib RM = del -CFLAGS = -I$(ZLIBINC) -Mc -O2 -W3 +CFLAGS = -DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -Mc -O2 -W3 LDFLAGS = # File extensions diff --git a/scripts/makefile.intel b/scripts/makefile.intel index fb705e121..498561c09 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -32,7 +32,7 @@ CALLING=r # __fastcall # -------------------------------------------------------------------------- CC=icl -c -CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 75cb1b58a..59bc2bcb3 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -27,7 +27,7 @@ LIBPATH=$(prefix)/lib DESTDIR= CC=cc -CFLAGS=-I../zlib -O +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 3d49e1252..9d030aeca 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=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \ +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 9b48c900f..c88006e18 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= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +CFLAGS= -DPNG_CONFIGURE_LIBPNG $(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 5e1040ed4..21a9ca684 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -22,8 +22,8 @@ LIBPATH=$(prefix)/lib DESTDIR= CC=cc -CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips -#CFLAGS=-O +CFLAGS=-DPNG_CONFIGURE_LIBPNG -I../zlib -O -systype sysv -DSYSV -w -Dmips +#CFLAGS=-DPNG_CONFIGURE_LIBPNG -O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm #RANLIB=ranlib diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 8ae8e6171..7fdc37fc5 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=-Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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.nommx b/scripts/makefile.nommx index d612d6a34..d1a26a940 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -51,7 +51,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \ +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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.openbsd b/scripts/makefile.openbsd index 1d21fd82c..736fb6de8 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -20,7 +20,7 @@ SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ HDRS= png.h pngconf.h -CFLAGS+= -W -Wall +CFLAGS+= -DPNG_CONFIGURE_LIBPNG -W -Wall CPPFLAGS+= -I${.CURDIR} NOPROFILE= Yes diff --git a/scripts/makefile.os2 b/scripts/makefile.os2 index affb03c1a..e3fd36d77 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=-I$(ZLIBINC) -W -Wall -O6 -funroll-loops -malign-loops=2 \ +CFLAGS=--DPNG_CONFIGURE_LIBPNG 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 cfe8a3ae5..59e49e020 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -41,7 +41,7 @@ exec_prefix=$(prefix) ZLIBLIB=../zlib ZLIBINC=../zlib -CFLAGS= -dy -belf -I$(ZLIBINC) -O3 +CFLAGS= -DPNG_CONFIGURE_LIBPNG -dy -belf -I$(ZLIBINC) -O3 LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm INCPATH=$(prefix)/include/libpng diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index f4f5344b8..baca87a5e 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -47,7 +47,7 @@ ZLIBINC=../zlib ABI= WARNMORE= # -g -DPNG_DEBUG=5 -CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 +CFLAGS=-DPNG_CONFIGURE_LIBPNG $(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 b83abc0cc..180cf2b68 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -48,8 +48,8 @@ ABI= WARNMORE=-fullwarn # Note: -KPIC is the default anyhow -#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 -CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) +#CFLAGS= -DPNG_CONFIGURE_LIBPNG $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 +CFLAGS=-DPNG_CONFIGURE_LIBPNG $(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 f79afe32a..45c3fa884 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=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE -CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE +#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 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm INCPATH=$(prefix)/include diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index ce21cf08f..a6b9b7976 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=-I$(ZLIBINC) -W -Wall -O \ +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 afb885ad0..60f7c0d8b 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -34,7 +34,7 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=rm -f -CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 984379c0c..898665c56 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=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5 +CFLAGS=-DPNG_CONFIGURE_LIBPNG -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 e9e49bacb..ecce8be0e 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=-O2 -Z -m$(MODEL) -I..\zlib -#CFLAGS=-D_NO_PROTO -O2 -Z -m$(MODEL) -I..\zlib # Turbo C older than 3.00 +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 CC=tcc LD=tcc LIB=tlib diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32 index 0b7442274..7b65a6b6a 100644 --- a/scripts/makefile.vcawin32 +++ b/scripts/makefile.vcawin32 @@ -15,7 +15,7 @@ CC = cl LD = link AR = lib -CFLAGS = -nologo -MD -O2 -W3 -I..\zlib +CFLAGS = -DPNG_CONFIGURE_LIBPNG -nologo -MD -O2 -W3 -I..\zlib LDFLAGS = -nologo ARFLAGS = -nologo RM = del diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index 5cf085e84..38367091f 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -15,7 +15,7 @@ CC = cl LD = link AR = lib -CFLAGS = -nologo -MD -O2 -W3 -I..\zlib +CFLAGS = -DPNG_CONFIGURE_LIBPNG -nologo -MD -O2 -W3 -I..\zlib LDFLAGS = -nologo ARFLAGS = -nologo RM = del diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom index 91742a46e..fee677841 100644 --- a/scripts/makefile.watcom +++ b/scripts/makefile.watcom @@ -36,7 +36,7 @@ CALLING=r # registers CC=wcc386 -CFLAGS=-$(CPU)$(CALLING) -fp$(CPU) -fpi87 -oneatx -mf -bt=$(OS) -i=$(ZLIBINC) -zq +CFLAGS=-DPNG_CONFIGURE_LIBPNG -$(CPU)$(CALLING) -fp$(CPU) -fpi87 -oneatx -mf -bt=$(OS) -i=$(ZLIBINC) -zq LD=wcl386 LDFLAGS=-zq diff --git a/scripts/makefile.wce b/scripts/makefile.wce index 5b023df94..37114a3d1 100644 --- a/scripts/makefile.wce +++ b/scripts/makefile.wce @@ -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) -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) -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 copy: @echo " * Copy of binary and development files" -- GitLab