diff --git a/.gitmodules b/.gitmodules index 82b7f291..82b42e3d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,4 +24,4 @@ url = https://github.com/jedisct1/libsodium.git [submodule "platform-darwin/External/libjson-c"] path = platform-darwin/External/libjson-c - url = https://github.com/json-c/json-c.git + url = https://github.com/lhunath/json-c.git diff --git a/platform-darwin/External/libjson-c b/platform-darwin/External/libjson-c index 95dff319..3e5ad38a 160000 --- a/platform-darwin/External/libjson-c +++ b/platform-darwin/External/libjson-c @@ -1 +1 @@ -Subproject commit 95dff31951c9388408d29e7ddf9a9edc4ec96dca +Subproject commit 3e5ad38a83a05b641cd84414a67a64992bf0e8c6 diff --git a/platform-darwin/Scripts/build_libjson-c-ios b/platform-darwin/Scripts/build_libjson-c-ios index 24f79ee8..230738d5 100755 --- a/platform-darwin/Scripts/build_libjson-c-ios +++ b/platform-darwin/Scripts/build_libjson-c-ios @@ -22,7 +22,7 @@ mkdir -p "$prefix/lib" \ export CFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" - [[ -e Makefile ]] && make -s really-clean + [[ -e Makefile ]] && make -s clean ./configure --host=i686-apple --disable-shared --prefix="$prefix_i386" make -j3 install ) @@ -33,7 +33,7 @@ mkdir -p "$prefix/lib" \ export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" - [[ -e Makefile ]] && make -s really-clean + [[ -e Makefile ]] && make -s clean ./configure --host=x86_64-apple --disable-shared --prefix="$prefix_x86_64" make -j3 install ) @@ -44,7 +44,7 @@ mkdir -p "$prefix/lib" \ export CFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" - [[ -e Makefile ]] && make -s really-clean + [[ -e Makefile ]] && make -s clean ./configure --host=x86_64-apple --target=arm-apple --disable-shared --prefix="$prefix_armv7" make -j3 install ) @@ -55,7 +55,7 @@ mkdir -p "$prefix/lib" \ export CFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" - [[ -e Makefile ]] && make -s really-clean + [[ -e Makefile ]] && make -s clean ./configure --host=x86_64-apple --target=arm-apple --disable-shared --prefix="$prefix_armv7s" make -j3 install ) @@ -66,7 +66,7 @@ mkdir -p "$prefix/lib" \ export CFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" - [[ -e Makefile ]] && make -s really-clean + [[ -e Makefile ]] && make -s clean ./configure --host=x86_64-apple --target=arm-apple --disable-shared --prefix="$prefix_arm64" make -j3 install ) diff --git a/platform-darwin/Scripts/build_libjson-c-osx b/platform-darwin/Scripts/build_libjson-c-osx index 406d3ae1..4a617771 100755 --- a/platform-darwin/Scripts/build_libjson-c-osx +++ b/platform-darwin/Scripts/build_libjson-c-osx @@ -17,7 +17,7 @@ mkdir -p "$prefix" export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} -O2 -g $CFLAGS" # -flto export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $LDFLAGS" # -flto export CPPFLAGS="$CFLAGS $CPPFLAGS" - [[ -e Makefile ]] && make -s really-clean + [[ -e Makefile ]] && make -s clean ./configure --disable-shared --prefix="$prefix" make -j3 check make -j3 install