Merge branch 'master' of https://github.com/mevansam/cmoss into mevan…

…sam_master
internalG · Aug 28, 2013 · f2fb1f6 · f2fb1f6
2 parents 69e1f8b + 43484ae
commit f2fb1f6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/README b/README
@@ -54,6 +54,7 @@ These build scripts were tested on a Mac OS X 10 with the following Mac ports:
   ncursesw @5.8_0 (active)
   openssl @1.0.0d_0 (active)
   wget @1.12_3+ssl (active)
+  libtool @2.4.2 (active)
   zlib @1.2.5_0 (active)
 
 The Android scripts should work in a Linux environment but have not been tested.

diff --git a/build-droid/build-all.sh b/build-droid/build-all.sh
@@ -61,7 +61,7 @@ export TINYXML_FILE="2_6_2"
 export EXPAT_VERSION="2.0.1"
 
 # Project version to use to build yajl (changing this may break the build)
-export YAJL_VERSION="2.0.1"
+export YAJL_VERSION="2.0.3"
 
 # Project version to use to build sqlcipher (changing this may break the build)
 export SQLCIPHER_VERSION="2.1.1"

diff --git a/build-droid/build-yajl.sh b/build-droid/build-yajl.sh
@@ -80,7 +80,7 @@ EOF
 
 mv "build/src/cmake_install.cmake" "build/src/cmake_install.cmake~"
 sed 's/\.dylib/\.so/g' build/src/cmake_install.cmake~ > build/src/cmake_install.cmake~1
-sed 's/\".*\/libyajl\.2\.0\.1\.so\"//' build/src/cmake_install.cmake~1 > build/src/cmake_install.cmake~2
+sed 's/\".*\/libyajl\.2\.0\.3\.so\"//' build/src/cmake_install.cmake~1 > build/src/cmake_install.cmake~2
 sed 's/\".*\/libyajl\.2\.so\"//' build/src/cmake_install.cmake~2 > build/src/cmake_install.cmake
 
 cat > Makefile <<EOF

diff --git a/build-ios/build-all.sh b/build-ios/build-all.sh
@@ -61,7 +61,7 @@ export TINYXML_FILE="2_6_2"
 export EXPAT_VERSION="2.0.1"
 
 # Project version to use to build yajl (changing this may break the build)
-export YAJL_VERSION="2.0.1"
+export YAJL_VERSION="2.0.3"
 
 # Project version to use to build sqlcipher (changing this may break the build)
 export SQLCIPHER_VERSION="2.1.1"