aboutsummaryrefslogtreecommitdiffstats
path: root/distrib/libpng-1.2.19/sources.make
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-11-18 15:47:18 -0800
committerSteve Kondik <shade@chemlab.org>2012-11-18 15:47:18 -0800
commita546c7006355a7bd1df4267ee53d0bfa2c017c8c (patch)
tree01be0bf6c0d6968e1468ec9661fd52110f9b05a7 /distrib/libpng-1.2.19/sources.make
parentbaf3d7830396202df5cc47bd7bcee109c319cdb3 (diff)
parent0f809250987b64f491bd3b4b73c0f0d33036a786 (diff)
downloadexternal_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.zip
external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.gz
external_qemu-a546c7006355a7bd1df4267ee53d0bfa2c017c8c.tar.bz2
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging
Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115
Diffstat (limited to 'distrib/libpng-1.2.19/sources.make')
-rw-r--r--distrib/libpng-1.2.19/sources.make3
1 files changed, 2 insertions, 1 deletions
diff --git a/distrib/libpng-1.2.19/sources.make b/distrib/libpng-1.2.19/sources.make
index f512f7b..4d11126 100644
--- a/distrib/libpng-1.2.19/sources.make
+++ b/distrib/libpng-1.2.19/sources.make
@@ -7,8 +7,10 @@ LIBPNG_SOURCES := png.c pngerror.c pngget.c pngmem.c pngpread.c pngread.c \
# Enable MMX code path for x86, except on Darwin where it fails
PNG_MMX := no
ifeq ($(HOST_ARCH),x86)
+ifneq ($(BUILD_DEBUG_EMULATOR),true)
PNG_MMX := yes
endif
+endif
ifeq ($(HOST_OS),darwin)
PNG_MMX := no
endif
@@ -20,4 +22,3 @@ else
endif
LIBPNG_SOURCES := $(LIBPNG_SOURCES:%=$(LIBPNG_DIR)/%)
-