X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=4b7295210bf6c2fbb237e5fce79ccd3ce11a4615;hp=20f6c18741c11e25ca6aa88a9482b50c29f73286;hb=c9dadcd65854eb7ea0018d7a1f392cd8fe0ed0ab;hpb=e38e711a60bd7a016867f665f31b5573a1dc4a2d diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index 20f6c18..4b72952 100755 --- a/cross-compile/android/sigrok-cross-android +++ b/cross-compile/android/sigrok-cross-android @@ -66,12 +66,12 @@ VER_GETTEXT=0.19.7 VER_ZLIB=1.2.8 VER_PCRE=8.38 VER_LIBFFI=3.2.1 -VER_GLIB=2.45.4 -VER_GLIB_SHORT=2.45 -VER_GLIBMM=2.45.41 -VER_GLIBMM_SHORT=2.45 -VER_LIBSIGCXX=2.6.2 -VER_LIBSIGCXX_SHORT=2.6 +VER_GLIB=2.48.1 +VER_GLIB_SHORT=2.48 +VER_GLIBMM=2.48.1 +VER_GLIBMM_SHORT=2.48 +VER_LIBSIGCXX=2.9.2 +VER_LIBSIGCXX_SHORT=2.9 VER_LIBZIP=1.1 VER_LIBFTDI1=1.2 VER_LIBUSB=1.0.19 @@ -211,7 +211,7 @@ fi $GIT_CLONE http://git.savannah.gnu.org/r/config.git # Get a toolchain for cmake that knows about Android. -$WGET https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake +$WGET https://raw.githubusercontent.com/arithran/android-cmake/master/toolchain/android.toolchain.cmake patch < ../android.toolchain.cmake.patch android.toolchain.cmake # -----------------------------------------------------------------------------