finish iOS

Author: zilongshanren

build/build.sh

@@ -420,35 +420,39 @@ do
 
 
         echo "Copying needed header files..."
-        #determine the real folder name
-        parse_original_library_folder_name=${lib}_header_files_folder
-        library_include_folder_name=${!parse_original_library_folder_name}
-        if [ -z $library_include_folder_name ];then
-            library_include_folder_name=$archive_name
-        fi
-        
-        
-        #copy header files for ios & mac
-        if [ $cfg_platform_name = "ios" ] || [ $cfg_platform_name = "mac" ];then
-            if [ ! -d $top_dir/build/$cfg_platform_name/include/$library_include_folder_name ];then
-                mkdir -p $top_dir/build/$cfg_platform_name/include/$library_include_folder_name
+        parse_ignore_header_files=${lib}_ignore_header_files
+        original_ignore_header_files=${!parse_ignore_header_files}
+        if [ "${original_ignore_header_files}" != "yes" ];then
+            #determine the real folder name
+            parse_original_library_folder_name=${lib}_header_files_folder
+            library_include_folder_name=${!parse_original_library_folder_name}
+            if [ -z $library_include_folder_name ];then
+                library_include_folder_name=$archive_name
+            fi
+            
+            
+            #copy header files for ios & mac
+            if [ $cfg_platform_name = "ios" ] || [ $cfg_platform_name = "mac" ];then
+                if [ ! -d $top_dir/build/$cfg_platform_name/include/$library_include_folder_name ];then
+                    mkdir -p $top_dir/build/$cfg_platform_name/include/$library_include_folder_name
+                fi
+            fi
+            
+            mkdir -p $cfg_platform_name/$original_arch_name/include/$library_include_folder_name
+            copy_include_file_path=${lib}_header_files
+            src_directory=$top_dir/contrib/$install_library_path/$arch/include/${!copy_include_file_path}
+            echo $src_directory
+            destination_header_path=$cfg_platform_name/$original_arch_name/include/$library_include_folder_name
+
+            if [ $cfg_platform_name = "ios" ] || [ $cfg_platform_name = "mac" ];then
+                destination_header_path=$cfg_platform_name/include/$library_include_folder_name
+            fi
+            
+            if [ -d "$src_directory" ];then
+                cp  -r $src_directory/* $destination_header_path
+            else
+                cp $src_directory $destination_header_path
             fi
-        fi
-        
-        mkdir -p $cfg_platform_name/$original_arch_name/include/$library_include_folder_name
-        copy_include_file_path=${lib}_header_files
-        src_directory=$top_dir/contrib/$install_library_path/$arch/include/${!copy_include_file_path}
-        echo $src_directory
-        destination_header_path=$cfg_platform_name/$original_arch_name/include/$library_include_folder_name
-
-        if [ $cfg_platform_name = "ios" ] || [ $cfg_platform_name = "mac" ];then
-            destination_header_path=$cfg_platform_name/include/$library_include_folder_name
-        fi
-        
-        if [ -d "$src_directory" ];then
-            cp  -r $src_directory/* $destination_header_path
-        else
-            cp $src_directory $destination_header_path
         fi
 
 
@@ -490,4 +494,13 @@ if [ $cfg_platform_name = "ios" ] || [ $cfg_platform_name = "mac" ];then
     done
 fi
 
+#check ios & mac library architecture
+if [ $cfg_platform_name = "ios" ] || [ $cfg_platform_name = "mac" ];then
+    for file in `ls ${cfg_platform_name}/libs`
+    do
+        lipo -info ${cfg_platform_name}/libs/$file
+    done
+fi
+
+
 echo "done!"

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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
-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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
+cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg"  "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
+cfg_default_arches_all=("armv7"  "i386" "arm64" "x86_64")
+cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
 
 
 cfg_build_fat_library=yes

build/main.ini

@@ -33,6 +33,9 @@ glew_header_files=GL
 #don't copy archive files for header only libraries, eg. rapidjson
 rapidjson_ignore_archive=yes
 
+#don't copy header files for some specific libraries
+lua_ignore_header_files=yes
+
 #header files Folder
 box2d_header_files_folder=Box2D
 zlib_header_files_folder=zlib