fix linux compile

Author: zilongshanren

build/build.sh

@@ -374,11 +374,7 @@ do
 
         cd -
 
-        local_library_install_path=$cfg_platform_name/$archive_name/prebuilt/$original_arch_name
-        mkdir -p $cfg_platform_name/include/$archive_name
-        if [ $cfg_platform_name = "android" ];then
-            local_library_install_path=$cfg_platform_name/$original_arch_name
-        fi
+        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"
@@ -405,7 +401,7 @@ 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" ];then
+                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
@@ -416,10 +412,11 @@ do
 
 
         echo "Copying needed heder files"
+        mkdir -p $cfg_platform_name/$arch/include/$archive_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/include/$archive_name/
+        destination_header_path=$cfg_platform_name/$arch/include/$archive_name/
         if [ -d $src_directory ];then
             cp  -r $src_directory/* $destination_header_path
         else

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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffer" "minizip" "tinyxml" "cjson" "luasocket")
+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" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffer" "minizip" "tinyxml" "cjson" "luasocket")
+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 "
 

contrib/src/flatbuffers/rules.mak

@@ -5,7 +5,6 @@ FLATBUFFERS_GITURL := https://github.com/google/flatbuffers.git
 $(TARBALLS)/flatbuffers-git.tar.xz:
 	$(call download_git,$(FLATBUFFERS_GITURL),master,1e4d28b)
 
-
 .sum-flatbuffers: flatbuffers-git.tar.xz
 	$(warning $@ not implemented)
 	touch $@

contrib/src/luasocket/rules.mak

@@ -18,6 +18,6 @@ luasocket: libluasocket-git.tar.xz .sum-luasocket
 # DEPS_luasocket = lua $(DEPS_lua)
 
 .luasocket: luasocket toolchain.cmake
-	cd $< && $(HOSTVARS) ${CMAKE} -DLUA_INCLUDE_DIR=$(PREFIX)
+	cd $< && $(HOSTVARS) ${CMAKE} -DLUA_INCLUDE_DIR=$(PREFIX) -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX)
 	cd $< && $(MAKE) VERBOSE=1 install
 	touch $@

contrib/src/tinyxml2/rules.mak

@@ -17,6 +17,6 @@ tinyxml2: libtinyxml2-git.tar.xz .sum-tinyxml2
 	$(MOVE)
 
 .tinyxml2: tinyxml2 toolchain.cmake
-	cd $< && $(HOSTVARS) ${CMAKE}
+	cd $< && $(HOSTVARS) ${CMAKE} -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX)
 	cd $< && $(MAKE) VERBOSE=1 install
 	touch $@