aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2011-02-09 12:43:48 -0800
committerRaphael Moll <ralf@android.com>2011-02-09 12:43:48 -0800
commit671f9cd672375a3ceb873a4982744aa730ad1baf (patch)
tree3dc22c1f3239bd2fa8e4c757ceb20e501f9280ca /Android.mk
parent3eb66a02a40c9f4005fc122e8614b5ed49f6c896 (diff)
downloadexternal_libpng-671f9cd672375a3ceb873a4982744aa730ad1baf.zip
external_libpng-671f9cd672375a3ceb873a4982744aa730ad1baf.tar.gz
external_libpng-671f9cd672375a3ceb873a4982744aa730ad1baf.tar.bz2
Fix libpng build under cygwin
Change-Id: I84afb43d6b18023131aaf411dd958df0e2c75b08
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk16
1 files changed, 12 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index d5c81d7..4e92908 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,10 +22,18 @@ common_SRC_FILES := \
pngwtran.c \
pngwutil.c
-common_CFLAGS := \
- -fvisibility=hidden ## -fomit-frame-pointer
-
-common_C_INCLUDES += \
+common_CFLAGS := -fvisibility=hidden ## -fomit-frame-pointer
+
+ifeq ($(HOST_OS),windows)
+ ifeq ($(USE_MINGW),)
+ # Case where we're building windows but not under linux (so it must be cygwin)
+ # In this case, gcc cygwin doesn't recognize -fvisibility=hidden
+ $(info libpng: Ignoring gcc flag $(common_CFLAGS) on Cygwin)
+ common_CFLAGS :=
+ endif
+endif
+
+common_C_INCLUDES +=
common_COPY_HEADERS_TO := libpng
common_COPY_HEADERS := png.h pngconf.h pngusr.h