mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Revised scripts/makefile.darwin: use system zlib; remove quotes

Browse Source 
around architecture list; add missing ppc architecture; add architecture
options to shared library link; don't try to create a shared lib based on
missing RELEASE variable (Toby Thain).
This commit is contained in:
Glenn Randers-Pehrson 2012-04-13 12:36:22 -05:00
parent e243a1fbd8
commit b4f5c42092
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ANNOUNCE
View File

@ -350,6 +350,10 @@ Version 1.6.0beta20 [March 29, 2012]
CVE-2011-3048). CVE-2011-3048).
Version 1.6.0beta21 [April 13, 2012] Version 1.6.0beta21 [April 13, 2012]
Revised scripts/makefile.darwin: use system zlib; remove quotes around
architecture list; add missing ppc architecture; add architecture options
to shared library link; don't try to create a shared lib based on missing
RELEASE variable.
Enable png_set_check_for_invalid_index() for both read and write. Enable png_set_check_for_invalid_index() for both read and write.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

4
CHANGES
View File

@ -4101,6 +4101,10 @@ Version 1.6.0beta20 [March 29, 2012]
CVE-2011-3048). CVE-2011-3048).
Version 1.6.0beta21 [April 13, 2012] Version 1.6.0beta21 [April 13, 2012]
Revised scripts/makefile.darwin: use system zlib; remove quotes around
architecture list; add missing ppc architecture; add architecture options
to shared library link; don't try to create a shared lib based on missing
RELEASE variable.
Enable png_set_check_for_invalid_index() for both read and write. Enable png_set_check_for_invalid_index() for both read and write.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

16
scripts/makefile.darwin
View File

@ -15,10 +15,8 @@ prefix=/usr/local
exec_prefix=$(prefix) exec_prefix=$(prefix)
# Where the zlib library and include files are located # Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib ZLIBLIB=/usr/lib
#ZLIBINC=/usr/local/include ZLIBINC=/usr/include
ZLIBLIB=../zlib
ZLIBINC=../zlib
# Library name: # Library name:
LIBNAME = libpng16 LIBNAME = libpng16
@ -37,7 +35,7 @@ MKDIR_P=mkdir -p
LN_SF=ln -sf LN_SF=ln -sf
RANLIB=ranlib RANLIB=ranlib
RM_F=/bin/rm -f RM_F=/bin/rm -f
ARCH="-arch i386 -arch x86_64" ARCH=-arch ppc -arch i386 -arch x86_64
# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops
CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops $(ARCH) CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops $(ARCH)
@ -107,7 +105,7 @@ $(LIBSOMAJ): $(OBJSDLL)
$(CC) -dynamiclib \ $(CC) -dynamiclib \
-install_name $(LIBPATH)/$(LIBSOMAJ) \ -install_name $(LIBPATH)/$(LIBSOMAJ) \
-current_version 16 -compatibility_version 16 \ -current_version 16 -compatibility_version 16 \
-o $(LIBSOMAJ) \ $(ARCH) -o $(LIBSOMAJ) \
$(OBJSDLL) -L$(ZLIBLIB) -lz $(OBJSDLL) -L$(ZLIBLIB) -lz
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
@ -136,10 +134,10 @@ install-static: install-headers libpng.a
install-shared: install-headers $(LIBSOMAJ) libpng.pc install-shared: install-headers $(LIBSOMAJ) libpng.pc
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) cp $(LIBSOMAJ) $(DL)
chmod 755 $(DL)/$(LIBSOREL) chmod 755 $(DL)/$(LIBSOMAJ)
(cd $(DL); \ (cd $(DL); \
$(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSOREL) $(LIBSO); \
$(LN_SF) $(LIBSO) $(OLDSO)) $(LN_SF) $(LIBSO) $(OLDSO))