Merge remote-tracking branch 'origin/testScripts' into testScripts

Author: zilongshanren

build/build.sh

@@ -327,7 +327,11 @@ do
         cd "${top_dir}/contrib/${cfg_platform_name}-${arch}"
 
         PREFIX="${top_dir}/contrib/install-${cfg_platform_name}/${arch}"
+
         my_target_host=cfg_${arch}_host_machine
+        if [ $cfg_is_cross_compile = "no" ];then
+            cfg_build_machine=${!my_target_host}
+        fi
 
         ../bootstrap --enable-$lib \
                      --build=$cfg_build_machine \

build/linux.ini

@@ -13,9 +13,10 @@ cfg_default_build_libraries="all"
 cfg_help_arch_string="i386,x86_64"
 cfg_help_sample_string="./build.sh -p=linux --libs=png --arch=i368,x86_64  --mode=debug"
 
-cfg_library_install_prefix="install-${cfg_platform_name}"
-cfg_library_build_folder="${cfg_platform_name}"
-cfg_build_fat_library=no
+cfg_is_cross_compile=no
+cfg_build_machine="x86_64-linux-gnu"
+cfg_x86_64_host_machine="x86_64-linux-gnu"
+cfg_i386_host_machine="i386-linux-gnu"
 
 
 cfg_all_supported_arches=("i386" "x86_64")
@@ -24,17 +25,7 @@ cfg_default_arches_all=("x86_64")
 cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl")
 
 
+cfg_build_fat_library=no
 cfg_build_release_mode="-O3 -DNDEBUG"
 cfg_build_debug_mode="-O0 -g -DDEBUG"
 
-function build_settings_for_linux()
-{
-    linux_arch=$1 
-
-    PREFIX="${top_dir}/contrib/install-${cfg_platform_name}/${linux_arch}"
-    pushd "${top_dir}/contrib"
-    mkdir -p "${cfg_platform_name}-${linux_arch}" && cd "${cfg_platform_name}-${linux_arch}"
-
-    ../bootstrap --enable-$2 --build=${linux_arch}-linux-gnu --host=${linux_arch}-linux-gnu --prefix=${PREFIX}
-
-}