Merge remote-tracking branch 'cocos2d_push/v4' into mips

Author: ricardoquesada

build/android.ini

@@ -44,6 +44,7 @@ cfg_build_fat_library=no
 #whether use mthumb instruction or not
 #format  cfg_${libname}_${archname}_use_mthumb
 cfg_curl_arm_use_mthumb=no  #for compile issue
+cfg_lua_arm_use_mthumb=no  #for compile issue
 
 #debug and release mode flag
 cfg_build_release_mode="-O3 -DNDEBUG "

build/build.sh

@@ -396,7 +396,7 @@ do
 
             for dep_archive in ${original_dependent_archive_list[@]}
             do
-                local_library_install_path=$cfg_platform_name/$original_arch_name
+                local_library_install_path=$cfg_platform_name/$original_arch_name/libs
                 mkdir -p $local_library_install_path
                 cp $top_dir/contrib/$install_library_path/$arch/lib/lib${dep_archive}.a $local_library_install_path/lib${dep_archive}.a
 

build/main.ini

@@ -29,6 +29,7 @@ glfw_header_files=GLFW
 
 #header files Folder
 box2d_header_files_folder=Box2D
+zlib_header_files_folder=zlib
 
 ##archive prebuilt name
 luajit_original_name=luajit-5.1

contrib/src/lua/rules.mak

@@ -66,8 +66,8 @@ ifdef HAVE_WIN32
 	mkdir -p -- "$(PREFIX)/lib/pkgconfig"
 	cp $</etc/lua.pc "$(PREFIX)/lib/pkgconfig/"
 endif
-ifdef HAVE_CROSS_COMPILE
-	cd $</src && $(MAKE) clean && $(MAKE) liblua.a && ranlib liblua.a && $(MAKE) luac
-	cp $</src/luac $(PREFIX)/bin
-endif
+# ifdef HAVE_CROSS_COMPILE
+# 	cd $</src && $(MAKE) clean && $(MAKE) liblua.a && ranlib liblua.a && $(MAKE) luac
+# 	cp $</src/luac $(PREFIX)/bin
+# endif
 	touch $@

contrib/src/webp/rules.mak

@@ -20,6 +20,8 @@ ifdef HAVE_ANDROID
 	cd $< && ln -s $(shell pwd)/webp $(shell pwd)/webp/jni
 	cd $< && ndk-build
 	cd $< && cp obj/local/$(MY_TARGET_ARCH)/libwebp.a $(PREFIX)/lib/
+	cd $< && mkdir -p $(PREFIX)/include/webp
+	cd $< && cp -a src/webp/*.h $(PREFIX)/include/webp
 else
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE)