summaryrefslogtreecommitdiff
path: root/scripts/makefile.cygwin
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2002-10-31 19:53:20 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-04-06 16:07:36 -0500
commit761bf9f06f3c544e6fb6ed46f3b08a363cf19b81 (patch)
treee848ffcde9e499aa1c6e1fc65a62ae84041e68fb /scripts/makefile.cygwin
parentc33ab4e8dfeb665b5670da0bae9abe3fa05ba92d (diff)
downloadlibpng-761bf9f06f3c544e6fb6ed46f3b08a363cf19b81.tar.gz
Imported from libpng-1.2.6beta2.tarv1.2.6beta2
Diffstat (limited to 'scripts/makefile.cygwin')
-rw-r--r--scripts/makefile.cygwin14
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index c3c6f0ce4..4bf80c0e3 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -36,6 +36,12 @@ DESTDIR=
# list at the bottom of this makefile.
CC=gcc
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+#RANLIB=echo
+MKDIR=/bin/mkdir -pv
+
ifdef MINGW
MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
@@ -79,7 +85,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.6beta1
+PNGMIN = 1.2.6beta2
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
@@ -93,10 +99,6 @@ LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz)
LDSFLAGS=$(strip -shared -L. $(MINGW_LDFLAGS) -Wl,--export-all)
LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
-MKDIR=/bin/mkdir -pv
-RANLIB=ranlib
-#RANLIB=echo
-
INCPATH=$(prefix)/include
LIBPATH=$(prefix)/lib
@@ -173,7 +175,7 @@ pnggccrd.pic.o: pnggccrd.c png.h pngconf.h
$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
$(STATLIB): $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
$(RANLIB) $@
$(SHAREDDEF): projects/msvc/png32ms.def