Merge remote-tracking branch 'refs/remotes/origin/v4' into v4

Conflicts:
	build/build.sh
	build/linux.ini
	build/main.ini

Author: zilongshanren

build/build.sh

@@ -389,24 +389,33 @@ do
         original_ignore_archive=${!parse_ignore_archive}
         if [ "${original_ignore_archive}" != "yes" ];then
 
+            #determine the lib folder name
+            parse_original_lib_folder_name=${lib}_lib_files_folder
+            original_lib_folder_name=${!parse_original_lib_folder_name}
+
+            if [ -z $original_lib_folder_name ];then
+                original_lib_folder_name=lib
+            fi
+
             #copy .a archive from install-platform folder
-            cp $top_dir/contrib/$install_library_path/$arch/lib/lib$original_archive_name.a $local_library_install_path/lib$archive_name.a
+            cp $top_dir/contrib/$install_library_path/$arch/${original_lib_folder_name}/lib$original_archive_name.a $local_library_install_path/lib$archive_name.a
 
             #copy dependent .a archive
             parse_dependent_archive_list=${lib}_dependent_archive_list
             original_dependent_archive_list=${!parse_dependent_archive_list}
             if [ ! -z $original_dependent_archive_list ];then
-                echo "copying dependent archives..."
+                echo "Copying dependent archives..."
                 original_dependent_archive_list=(${original_dependent_archive_list//,/ })
 
                 for dep_archive in ${original_dependent_archive_list[@]}
                 do
                     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
+                    cp $top_dir/contrib/$install_library_path/$arch/${original_lib_folder_name}/lib${dep_archive}.a $local_library_install_path/lib${dep_archive}.a
 
                 done
             fi
+
         fi
 
 

build/linux.ini

@@ -17,9 +17,9 @@ 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" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw" "rapidjson")
+cfg_all_supported_libraries=("png" "zlib" "luajit" "websockets" "curl" "freetype" "jpeg"  "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw" "sqlite3" "glew" "rapidjson")
 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" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw" "rapidjson")
+cfg_default_libraries_all=("png" "zlib" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw" "sqlite3" "glew" "rapidjson")
 
 
 cfg_build_fat_library=no

build/main.ini

@@ -27,19 +27,26 @@ box2d_header_files=Box2D
 ssl_header_files=openssl
 glfw_header_files=GLFW
 rapidjson_header_files=rapidjson
+sqlite3_header_files=sqlite*.h
+glew_header_files=GL
 
 #don't copy archive files for header only libraries, eg. rapidjson
 rapidjson_ignore_archive=yes
 
 #header files Folder
 box2d_header_files_folder=Box2D
 zlib_header_files_folder=zlib
+glew_header_files_folder=GL
+
+#lib files folder
+glew_lib_files_folder=lib64
 
 ##archive prebuilt name
 luajit_original_name=luajit-5.1
 box2d_original_name=Box2D
 flatbuffers_original_name=flatbuffer
 glfw_original_name=glfw3
+glew_original_name=GLEW
 
 
 ##archive_alias

contrib/src/cjson/rules.mak

@@ -16,9 +16,9 @@ cjson: libcjson-git.tar.xz .sum-cjson
 	$(APPLY) $(SRC)/cjson/cmake-patch.patch
 	$(MOVE)
 
-# DEPS_cjson = lua $(DEPS_lua)
+DEPS_cjson = luajit $(DEPS_luajit)
 
 .cjson: cjson toolchain.cmake
-	cd $< && $(HOSTVARS) ${CMAKE} -DUSE_INTERNAL_FPCONV=1 -DLUA_INCLUDE_DIR=$(PREFIX)
+	cd $< && $(HOSTVARS) ${CMAKE} -DUSE_INTERNAL_FPCONV=1 -DLUA_INCLUDE_DIR=$(PREFIX)/include/luajit-2.0
 	cd $< && $(MAKE) VERBOSE=1 install
 	touch $@

contrib/src/luajit/rules.mak

@@ -10,6 +10,7 @@ $(TARBALLS)/luajit-$(LUAJIT_VERSION).tar.gz:
 
 luajit: luajit-$(LUAJIT_VERSION).tar.gz .sum-luajit
 	$(UNPACK)
+	mv LuaJIT-2.0.3 $@-2.0.3
 ifeq ($(LUAJIT_VERSION),2.0.1)
 	$(APPLY) $(SRC)/luajit/v2.0.1_hotfix1.patch
 endif

contrib/src/luasocket/rules.mak

@@ -13,11 +13,12 @@ $(TARBALLS)/libluasocket-git.tar.xz:
 
 luasocket: libluasocket-git.tar.xz .sum-luasocket
 	$(UNPACK)
+	$(APPLY) $(SRC)/luasocket/delete-makefile.patch
 	$(MOVE)
 
-# DEPS_luasocket = lua $(DEPS_lua)
+DEPS_luasocket = luajit $(DEPS_luajit)
 
 .luasocket: luasocket toolchain.cmake
-	cd $< && $(HOSTVARS) ${CMAKE} -DLUA_INCLUDE_DIR=$(PREFIX) -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX)
+	cd $< && $(HOSTVARS) ${CMAKE} -DLUA_INCLUDE_DIR=$(PREFIX)/include/luajit-2.0 -DCMAKE_INSTALL_PREFIX:PATH=$(PREFIX)
 	cd $< && $(MAKE) VERBOSE=1 install
 	touch $@

contrib/src/openssl/rules.mak

@@ -18,12 +18,12 @@ endif
 ifdef HAVE_LINUX
 ifeq ($(MY_TARGET_ARCH),x86_64)
 OPENSSL_CONFIG_VARS="linux-x86_64"
-OPENSSL_ARCH=-m64 -no-ssl2
+OPENSSL_ARCH=-m64
 endif
 
 ifeq ($(MY_TARGET_ARCH),i386)
 OPENSSL_CONFIG_VARS="linux-generic32"
-OPENSSL_ARCH=-m32 -no-ssl2
+OPENSSL_ARCH=-m32
 endif
 endif
 

contrib/src/sqlite/rules.mak

@@ -1,4 +1,4 @@
-# sqlite
+# sqlite3
 
 SQLITE_VERSION := 3.6.20
 SQLITE_URL := http://www.sqlite.org/sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
@@ -9,11 +9,11 @@ $(TARBALLS)/sqlite-$(SQLITE_VERSION).tar.gz:
 
 .sum-sqlite: sqlite-$(SQLITE_VERSION).tar.gz
 
-sqlite: sqlite-$(SQLITE_VERSION).tar.gz .sum-sqlite
+sqlite3: sqlite-$(SQLITE_VERSION).tar.gz .sum-sqlite
 	$(UNPACK)
 	$(MOVE)
 
-.sqlite: sqlite
+.sqlite3: sqlite3
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) && $(MAKE) install
 	touch $@

contrib/src/zlib/rules.mak

@@ -13,6 +13,10 @@ ifdef HAVE_TIZEN
 EX_ECFLAGS = -fPIC
 endif
 
+ifdef HAVE_LINUX 
+EX_ECFLAGS = -fPIC
+endif
+
 ifdef HAVE_WIN32
 extra_makefile=-fwin32/Makefile.gcc
 endif