Merge pull request #35 from andyque/add-all-other-3rd-party-libs

Add all other 3rd party libs

Author: zilongshanren

build/android.ini

@@ -30,19 +30,19 @@ 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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
 cfg_default_arches_all=("arm" "armv7" "x86")
-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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
 
 
 #whether build fat library, use lipo -S create
 cfg_build_fat_library=no
 
 #whether use mthumb instruction or not
 #format  cfg_${libname}_${archname}_use_mthumb
-cfg_curl_arm_use_mthumb=no
+cfg_curl_arm_use_mthumb=no  #for compile issue
 
 #debug and release mode flag
-cfg_build_release_mode="-O3 -DNDEBUG"
-cfg_build_debug_mode="-O0 -g -DDEBUG"
+cfg_build_release_mode="-O3 -DNDEBUG "
+cfg_build_debug_mode="-O0 -g -DDEBUG "
 

build/build.sh

@@ -252,13 +252,16 @@ function create_fat_library()
 
     echo "create fat library lib$library_name for $all_static_libs"
     $LIPO -create  $all_static_libs \
-          -output $cfg_platform_name/$library_name/prebuilt/lib$library_name.a
+          -output $cfg_platform_name/lib$library_name.a
 
     # rm $all_static_libs
 
     # remove debugging info don't strip
     # $STRIP -S $library_name/prebuilt/lib$library_name.a
-    $LIPO -info $cfg_platform_name/$library_name/prebuilt/lib$library_name.a
+    $LIPO -info $cfg_platform_name/lib$library_name.a
+
+    rm $all_static_libs
+    rm -rf $cfg_platform_name/$library_name/prebuilt
 }
 
 
@@ -287,7 +290,7 @@ do
     fi
 
 
-    mkdir -p $cfg_platform_name/$archive_name/include/
+    # mkdir -p $cfg_platform_name/$archive_name/include/
 
     for arch in "${build_arches[@]}"
     do
@@ -371,7 +374,8 @@ do
 
         cd -
 
-        local_library_install_path=$cfg_platform_name/$archive_name/prebuilt/$original_arch_name
+        local_library_install_path=$cfg_platform_name/$original_arch_name
+        
         if [ ! -d $local_library_install_path ]; then
             echo "create folder for library with specify arch. $local_library_install_path"
             mkdir -p $local_library_install_path
@@ -397,6 +401,9 @@ do
             for dep_archive in ${original_dependent_archive_list[@]}
             do
                 local_library_install_path=$cfg_platform_name/${dep_archive}/prebuilt/$original_arch_name
+                if [ $cfg_platform_name = "android"] || [ $cfg_platform_name = "linux" ];then
+                    local_library_install_path=$cfg_platform_name/$original_arch_name
+                fi
                 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
 
@@ -405,8 +412,16 @@ do
 
 
         echo "Copying needed heder files"
+        mkdir -p $cfg_platform_name/$arch/include/$archive_name
         copy_include_file_path=${lib}_header_files
-        cp  -r $top_dir/contrib/$install_library_path/$arch/include/${!copy_include_file_path} $cfg_platform_name/$archive_name/include
+        src_directory=$top_dir/contrib/$install_library_path/$arch/include/${!copy_include_file_path}
+        echo $src_directory
+        destination_header_path=$cfg_platform_name/$arch/include/$archive_name/
+        if [ -d $src_directory ];then
+            cp  -r $src_directory/* $destination_header_path
+        else
+            cp $src_directory $destination_header_path
+        fi
 
 
         echo "cleaning up"

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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
 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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
 
 
 cfg_build_fat_library=yes

build/linux.ini

@@ -17,12 +17,12 @@ cfg_i386_host_machine="i386-linux-gnu"
 
 
 cfg_all_supported_arches=("i386" "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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw")
 cfg_default_arches_all=("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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw")
 
 
 cfg_build_fat_library=no
-cfg_build_release_mode="-O3 -DNDEBUG"
-cfg_build_debug_mode="-O0 -g -DDEBUG"
+cfg_build_release_mode="-O3 -DNDEBUG "
+cfg_build_debug_mode="-O0 -g -DDEBUG "
 

build/mac.ini

@@ -20,9 +20,9 @@ cfg_is_cross_compile=no
 
 #build arches and build libraries
 cfg_all_supported_arches=("i386" "x86_64")
-cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg"  "tiff" "webp" "chipmunk" "glfw" "openssl")
+cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg"  "tiff" "webp" "chipmunk" "glfw" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
 cfg_default_arches_all=("x86_64")
-cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "glfw" "openssl")
+cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "glfw" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
 
 
 #whether build fat library, use lipo -S create

build/main.ini

@@ -14,10 +14,25 @@ webp_header_files=webp
 websockets_header_files=libwebsockets.h
 zlib_header_files=z*.h
 chipmunk_header_files=chipmunk
+edtaa3func_header_files=edtaa3func.h
+xxhash_header_files=xxhash.h
+xxtea_header_files=xxtea.h
+convertutf_header_files=ConvertUTF.h
+flatbuffers_header_files=flatbuffers
+minizip_header_files=minizip
+tinyxml2_header_files=tinyxml2.h
+cjson_header_files=cjson
+luasocket_header_files=luasocket
+box2d_header_files=Box2D
+ssl_header_files=openssl
+glfw_header_files=GLFW
 
 
 ##archive prebuilt name
 luajit_original_name=luajit-5.1
+box2d_original_name=Box2D
+flatbuffers_original_name=flatbuffer
+glfw_original_name=glfw3
 
 ##archive_alias
 zlib_archive_alias=z

build/tizen.ini

@@ -19,9 +19,9 @@ cfg_armv7_toolchain_bin="${TIZEN_SDK}/tools/arm-linux-gnueabi-gcc-4.8/bin"
 
 #build arches and build libraries
 cfg_all_supported_arches=("armv7")
-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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffer" "minizip" "tinyxml" "cjson" "luasocket")
 cfg_default_arches_all=("armv7")
-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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffer" "minizip" "tinyxml" "cjson" "luasocket")
 
 
 #whether build fat library, use lipo -S create

contrib/src/box2d/SHA512SUMS

@@ -0,0 +1 @@
+dc63efa816a846b1e0413a49ffa67f8f88726a81f28b4cfadda50244763b5389ae96d379e4afef2d0ee87a2ffd132a5a344107b6eb0e11081e235d1c9e5ddad0  Box2D_v2.3.0.7z

contrib/src/box2d/rules.mak

@@ -0,0 +1,21 @@
+# box2d
+
+BOX2D_VERSION := 2.3.0
+BOX2D_URL := https://github.com/andyque/Box2D.git
+
+$(TARBALLS)/libbox2d-git.tar.xz:
+	$(call download_git,$(BOX2D_URL),master)
+
+.sum-box2d: libbox2d-git.tar.xz
+	$(warning $@ not implemented)
+	touch $@
+
+box2d: libbox2d-git.tar.xz .sum-box2d
+	$(UNPACK)
+	$(MOVE)
+
+
+.box2d: box2d toolchain.cmake
+	cd $</Box2D && $(HOSTVARS_PIC) $(CMAKE) . -DBOX2D_BUILD_EXAMPLES=0
+	cd $</Box2D && $(MAKE) VERBOSE=1 install
+	touch $@