Skip to content

C
core
Kaydet (Commit) 3fafb2f3 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Use system zlib on Android, too

üst db280c82
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
libpng/libpng-1.5.1.patch
Dosyayı görüntüle @ 3fafb2f3
...@@ -238,10 +238,10 @@ ...@@ -238,10 +238,10 @@
* data in PNG files. * data in PNG files.
*/ */
+/* WTF, surely this should depend explicitly on whether using the system or +/* WTF, surely this should depend explicitly on whether using the system or
+ * internal zlib, not on OS... But yeah, so maybe MacOSX (and iOS) are the only OSes for which + * internal zlib, not on OS... But yeah, so maybe MacOSX, iOS and Android are the only OSes for which
+ * we use a system zlib but internal libpng, at least by default. + * we use a system zlib but internal libpng, at least by default.
+ */ + */
+#if defined MACOSX || defined IOS +#if defined MACOSX || defined IOS || defined ANDROID
#include "zlib.h" #include "zlib.h"
+#else +#else
+#include <external/zlib/zlib.h> +#include <external/zlib/zlib.h>
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
* of files at once by typing "pngtest -m file1.png file2.png ..." * of files at once by typing "pngtest -m file1.png file2.png ..."
*/ */
+#if defined MACOSX || defined IOS +#if defined MACOSX || defined IOS || defined ANDROID
#include "zlib.h" #include "zlib.h"
+#else +#else
+#include <external/zlib/zlib.h> +#include <external/zlib/zlib.h>
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
#endif #endif
-#include "zlib.h" /* For crc32 */ -#include "zlib.h" /* For crc32 */
+#if defined MACOSX || defined IOS +#if defined MACOSX || defined IOS || defined ANDROID
+#include "zlib.h" +#include "zlib.h"
+#else +#else
+#include <external/zlib/zlib.h> +#include <external/zlib/zlib.h>
......
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