Commit 8ef23858 authored by hartman's avatar hartman
Browse files

* forwardport [18332]:

  - don't compile pngtest, it's not SDK compatible
  - enable sdk on contrib again
parent 55da3392
......@@ -72,19 +72,19 @@ case $HOST in
echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
CFLAGS_TUNING=" -mtune=G4"
#EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
#EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
;;
i686-apple-darwin8)
SDK_TARGET=10.3
SDK_TARGET=10.4
echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
echo "HAVE_DARWIN_OS = 1" >> config.mak
echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
CFLAGS_TUNING=" -march=pentium-m -mtune=prescott"
#EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
#EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
;;
i586-pc-beos)
......
diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
--- libpng-1.2.12/scripts/makefile.darwin 2006-06-27 22:22:40.000000000 +0200
+++ libpng/scripts/makefile.darwin 2006-07-27 12:07:18.000000000 +0200
+++ libpng/scripts/makefile.darwin 2006-12-08 18:15:36.000000000 +0100
@@ -7,14 +7,14 @@
# For conditions of distribution and use, see copyright notice in png.h
......@@ -32,6 +32,15 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib
@@ -72,7 +72,7 @@
.c.pic.o:
$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) libpng.pc libpng-config
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
@@ -178,7 +178,7 @@
chmod 755 $(DB)/$(LIBNAME)-config
(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment