From 721b73bc557e8e400ed5b02f23531064650ec105 Mon Sep 17 00:00:00 2001
From: Sven Weidauer <sven.weidauer@gmail.com>
Date: Mon, 7 Mar 2011 16:47:39 +0000
Subject: Using feature_enabled in Makefile.target to see if Apple ImageIO
 should be used.

svn path=/trunk/netsurf/; revision=11931
---
 Makefile.defaults     | 3 ++-
 cocoa/Makefile.target | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.defaults b/Makefile.defaults
index e84d2935d..daf30e2ba 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -379,9 +379,10 @@ ifeq ($(TARGET),cocoa)
   NETSURF_USE_MNG := NO
   
   NETSURF_USE_JPEG := NO
+  NETSURF_USE_IMAGEIO := YES
 
   # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized -DWITH_APPLE_IMAGE
+  CFLAGS += -O2 -Wuninitialized 
 
 endif
 
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index ee79b9c92..f45133438 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -43,6 +43,7 @@
   $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))
   $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng)  ))
   $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
+  $(eval $(call feature_enabled,IMAGEIO,-DWITH_APPLE_IMAGE,,Apple ImageIO       ))
 
   ifneq ($(UNIVERSAL),)
     UNIVERSAL_FLAGS := $(foreach arch,$(UNIVERSAL),-arch $(arch) )
-- 
cgit v1.2.3