add android ndk stl include directory

Author: zilongshanren

build/android.ini

@@ -29,9 +29,9 @@ cfg_armv7_toolchain_bin="${ANDROID_NDK}/toolchains/arm-linux-androideabi-${cfg_d
 
 #build arches and build libraries
 cfg_all_supported_arches=("arm" "armv7" "x86" "arm64")
-cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg"  "tiff" "webp" "chipmunk" "openssl")
+cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg"  "tiff" "webp" "chipmunk" "openssl" "gafplayer")
 cfg_default_arches_all=("arm" "armv7" "x86" "arm64")
-cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl")
+cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "gafplayer")
 
 
 #whether build fat library, use lipo -S create

build/ios.ini

@@ -14,9 +14,9 @@ cfg_armv7s_host_machine="arm-apple-darwin"
 cfg_arm64_host_machine="arm-apple-darwin"
 
 cfg_all_supported_arches=("armv7" "armv7s" "i386" "arm64" "x86_64")
-cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg"  "tiff" "webp" "chipmunk" "openssl")
+cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg"  "tiff" "webp" "chipmunk" "openssl" "gafplayer")
 cfg_default_arches_all=("armv7" "armv7s" "i386" "arm64" "x86_64")
-cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl")
+cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "gafplayer")
 
 
 cfg_build_fat_library=yes

contrib/src/gafplayer/rules.mak

@@ -1,20 +1,18 @@
 # gafplayer
 
-GAFPLYER_GITURL := [email protected]:andyque/Cocos2dxGAFPlayer.git
+GAFPLAYER_GITURL := [email protected]:andyque/Cocos2dxGAFPlayer.git
 
-ifdef HAVE_MACOSX
-PKGS += gafplyer
-endif
+PKGS += gafplayer
 
-$(TARBALLS)/gafplyer-git.tar.xz:
-	$(call download_git,$(GAFPLYER_GITURL),addCMakeSupport)
+$(TARBALLS)/gafplayer-git.tar.xz:
+	$(call download_git,$(GAFPLAYER_GITURL),addCMakeSupport)
 
 
-.sum-gafplyer: gafplyer-git.tar.xz
+.sum-gafplayer: gafplayer-git.tar.xz
 	$(warning $@ not implemented)
 	touch $@
 
-gafplyer: gafplyer-git.tar.xz .sum-gafplyer
+gafplayer: gafplayer-git.tar.xz .sum-gafplayer
 	$(UNPACK)
 	$(MOVE)
 
@@ -24,9 +22,20 @@ endif
 
 ifdef HAVE_MACOSX
 EX_ECFLAGS = -DMACOSX_DEPLOYMENT_TARGET=10.7
+CMAKE_DEFINE=MACOX
+endif
+
+ifdef HAVE_IOS
+CMAKE_DEFINE=IOS
 endif
 
-.gafplyer: gafplyer toolchain.cmake
-	cd $</Library && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" ${CMAKE}
+ifdef HAVE_ANDROID
+CMAKE_DEFINE=ANDROID
+endif
+
+
+
+.gafplayer: gafplayer toolchain.cmake
+	cd $</Library && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" ${CMAKE} -D${CMAKE_DEFINE}=1
 	cd $</Library && $(MAKE) VERBOSE=1 install
 	touch $@

contrib/src/main.mak

@@ -419,6 +419,8 @@ ifdef HAVE_ANDROID
 	echo "set(CMAKE_SYSTEM_NAME Linux)" >> $@
 	echo "set(CMAKE_CXX_SYSROOT_FLAG \"\")" >> $@
 	echo "set(CMAKE_C_SYSROOT_FLAG \"\")" >> $@
+	echo "include_directories($(ANDROID_NDK)/sources/android/support/include \
+		$(ANDROID_NDK)/sources/cxx-stl/llvm-libc++/libcxx/include)"  >> $@
 endif
 ifdef HAVE_TIZEN
 	echo "set(CMAKE_SYSTEM_NAME Linux)" >> $@