Get latest android cmake to support NDK 8e

2013-04-13 15:09:05 -05:00 · 2013-04-13 15:09:05 -05:00 · 24347e5176
parent 605bbf5ca8
commit 24347e5176
2 changed files with 927 additions and 413 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -482,6 +482,13 @@ else()
 	set(LZO lzo2)
 endif()

+if(ANDROID)
+	message("Using static libpng from Externals")
+	add_subdirectory(Externals/libpng)
+	include_directories(Externals/libpng)
+	set(PNG libpng)
+endif()
+
 if(OPENAL_FOUND)
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		check_lib(SOUNDTOUCH SoundTouch soundtouch/soundtouch.h QUIET)
--- a/Source/Android/android.toolchain.cmake
+++ b/Source/Android/android.toolchain.cmake