diff options
| author | Raphael Moll <ralf@android.com> | 2011-02-11 14:54:56 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-02-11 14:54:56 -0800 |
| commit | 7b81f64c8315ead539c7955fbc790e7596376119 (patch) | |
| tree | 3dc22c1f3239bd2fa8e4c757ceb20e501f9280ca | |
| parent | 3eb66a02a40c9f4005fc122e8614b5ed49f6c896 (diff) | |
| parent | 671f9cd672375a3ceb873a4982744aa730ad1baf (diff) | |
| download | external_libpng-7b81f64c8315ead539c7955fbc790e7596376119.zip external_libpng-7b81f64c8315ead539c7955fbc790e7596376119.tar.gz external_libpng-7b81f64c8315ead539c7955fbc790e7596376119.tar.bz2 | |
Merge "Fix libpng build under cygwin"
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -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 |