Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Gautam Chitnis
web-ui-redesign
Commits
3bf4e344
Commit
3bf4e344
authored
Apr 10, 2006
by
damienf
Browse files
- update darwin/macosx patch for libpng-1.2.8
parent
648b747e
Changes
2
Hide whitespace changes
Inline
Side-by-side
extras/contrib/src/Makefile
View file @
3bf4e344
...
...
@@ -1407,7 +1407,7 @@ endif
.png
:
libpng
ifdef
HAVE_DARWIN_OS
(
cd
$<
;
cp
scripts/makefile.
macosx
Makefile
&&
make
&&
make
install
)
(
cd
$<
;
cp
scripts/makefile.
darwin
Makefile
&&
make
&&
make
install
)
else
ifdef
HAVE_WIN32
(
cd
$<
;
rm
-f
INSTALL
;
cp
scripts/makefile.cygwin Makefile
&&
make
$(HOSTCC)
&&
make install-static
)
...
...
extras/contrib/src/Patches/libpng-osx.patch
View file @
3bf4e344
diff -ruN libpng-1.2.5/scripts/makefile.macosx libpng/scripts/makefile.macosx
--- libpng-1.2.5/scripts/makefile.macosx 2002-10-03 13:32:34.000000000 +0200
+++ libpng/scripts/makefile.macosx 2006-02-22 22:05:47.000000000 +0100
@@ -6,7 +6,7 @@
--- libpng/scripts/makefile.darwin.orig 2004-12-03 00:14:31.000000000 +0000
+++ libpng/scripts/makefile.darwin 2006-04-10 21:55:35.000000000 +0100
@@ -7,7 +7,7 @@
# For conditions of distribution and use, see copyright notice in png.h
# where make install puts libpng.a and png.h
# where
"
make install
"
puts libpng.a
, libpng12.dylib, png.h
and png
conf
.h
-prefix=/usr/local
+prefix=??PREFIX??
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib
@@ -
20
,8 +
20
,8 @@
PNGMIN = 1.2.5
PNGVER = $(PNGMAJ).$(PNGMIN)
-CFLAGS=
-fno-common
-I$(ZLIBINC) -
O # -g -DPNG_DEBUG=5
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz
-current_version $(PNGVER)
+CFLAGS=??EXTRA_CFLAGS??
-fno-common
-I$(ZLIBINC) -
O # -g -DPNG_DEBUG=5
+LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng -lz
LIBNAME=libpng12
SHAREDLIB_POSTFIX=dy
lib
@@ -5
2
,7 +5
2
,7 @@
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o
-all: libpng.a pngtest
shared
libpng.pc libpng-config
@@ -
16
,8 +
16
,8 @@
ZLIBINC=../zlib
CC=cc
-CFLAGS=-I$(ZLIBINC) -
Wall -O3 -funroll-loops
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng
12
-lz
+CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -
Wall -O3 -funroll-loops
+LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng
12
-lz
#RANLIB=echo
RANLIB=ran
lib
@@ -5
8
,7 +5
8
,7 @@
.c.pic.o:
$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
-all: libpng.a
$(LIBNAME).dylib
pngtest libpng.pc libpng-config
+all: libpng.a pngtest libpng.pc libpng-config
shared: $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX
)
@@ -1
53
,7 +1
53
,7 @@
libpng.a: $(OBJS
)
ar rc $@ $(OBJS)
@@ -1
64
,7 +1
64
,7 @@
chmod 755 $(DB)/$(LIBNAME)-config
(cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
...
...
@@ -38,4 +37,4 @@ diff -ruN libpng-1.2.5/scripts/makefile.macosx libpng/scripts/makefile.macosx
+install: install-static install-man install-config
# If you installed in $(DESTDIR), test-installed won't work until you
# move the library to its final location.
# move the library to its final location.
Use test-dd to test it
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment