summaryrefslogtreecommitdiff
path: root/scripts/makefile.cygwin
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2002-09-17 23:06:26 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2011-09-03 12:23:11 -0500
commit3bdb7fed6ef60c2d823282115aa2a94c749ac841 (patch)
tree0c45fe77be7e172385611f4698c7a434f5f37439 /scripts/makefile.cygwin
parent0e928a62e911b660b4bbcd75ef366027aa2e093f (diff)
downloadlibpng-3bdb7fed6ef60c2d823282115aa2a94c749ac841.tar.gz
[libpng10] Imported from libpng-1.0.15rc3.tarv1.0.15rc3
Diffstat (limited to 'scripts/makefile.cygwin')
-rw-r--r--scripts/makefile.cygwin11
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index cd45a3e87..1c720edcf 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng10
PNGMAJ = 0
CYGDLL = 10
-PNGMIN = 1.0.15rc2
+PNGMIN = 1.0.15rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
@@ -147,9 +147,8 @@ libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
installation..'\n' using PREFIX=\"$(prefix)\"'\n'
( cat $(S)/scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \
- echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo cflags=\"\"; \
- echo ldflags=\"-L$(LIBPATH)\"; \
+ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+ echo L_opts=\"-L$(LIBPATH)\"; \
echo libs=\"-lpng$(CYGDLL) -lz\"; \
cat $(S)/scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config
@@ -265,9 +264,9 @@ install: install-static install-shared install-man install-config
test-installed:
$(CC) $(CFLAGS) \
- `$(BINPATH)/libpng10-config --cppflags --cflags` pngtest.c \
+ `$(BINPATH)/libpng10-config --cflags` pngtest.c \
-L$(ZLIBLIB) \
- -o pngtesti$(EXE) `$(BINPATH)/libpng10-config --ldflags --libs`
+ -o pngtesti$(EXE) `$(BINPATH)/libpng10-config --ldflags`
./pngtesti$(EXE) pngtest.png
clean: