Removed libpng submodule and using official libpng url to build it

ChadCSong · Sep 5, 2014 · ea870ce · ea870ce
1 parent 09af863
commit ea870ce
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.o
 build
 toolchain-*
+libpng-*
 
 # Created by http://www.gitignore.io
 
@@ -33,4 +34,3 @@ Temporary Items
 
 # KDE directory preferences
 .directory
-
diff --git a/.gitmodules b/.gitmodules
@@ -16,9 +16,6 @@
 [submodule "expat"]
 	path = expat
 	url = https://github.com/hiteshsondhi88/expat.git
-[submodule "libpng"]
-	path = libpng
-	url = https://github.com/hiteshsondhi88/libpng.git
 [submodule "fribidi"]
 	path = fribidi
 	url = https://github.com/hiteshsondhi88/fribidi.git

diff --git a/download_from_repo.sh b/download_from_repo.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+url="$1"
+tarcommand="$2"
+dirname="$3"
+delete_regex="$4"
+
+if [ ! -d "$dirname" ]; then
+    rm -rf $delete_regex
+    wget -O- "$url" | tar "$tarcommand"
+fi
diff --git a/libpng b/libpng
diff --git a/libpng_build.sh b/libpng_build.sh
diff --git a/settings.sh b/settings.sh
@@ -2,6 +2,10 @@
 
 SUPPORTED_ARCHITECTURES=(armeabi-v7a armeabi-v7a-neon)
 ANDROID_NDK_ROOT_PATH=${ANDROID_NDK}
+if [[ -z "$ANDROID_NDK_ROOT_PATH" ]]; then
+  echo "You need to set ANDROID_NDK environment variable, please check instructions"
+  exit
+fi
 ANDROID_API_VERSION=9
 NDK_TOOLCHAIN_ABI_VERSION=4.8