Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on Jul 20th, 2012  |  syntax: None  |  size: 1.40 KB  |  hits: 7  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -ur android-ndk-r7/build/tools/prebuilt-common.sh android-ndk-r7.new/build/tools/prebuilt-common.sh
  2. --- android-ndk-r7/build/tools/prebuilt-common.sh       2012-02-18 14:49:37.619625917 -0600
  3. +++ android-ndk-r7.new/build/tools/prebuilt-common.sh   2012-02-18 09:27:26.749461521 -0600
  4. @@ -554,9 +554,9 @@
  5.                  ;;
  6.          esac
  7.          if [ "$TRY64" = "yes" ]; then
  8. -            ABI_CONFIGURE_HOST=amd64-mingw32msvc
  9. +            ABI_CONFIGURE_HOST=x86_64-w64-mingw32
  10.          else
  11. -            ABI_CONFIGURE_HOST=i586-mingw32msvc
  12. +            ABI_CONFIGURE_HOST=i686-w64-mingw32
  13.          fi
  14.          HOST_OS=windows
  15.          HOST_TAG=windows
  16. @@ -651,7 +651,8 @@
  17.      $NDK_CCACHE $CC $HOST_CFLAGS -c -o $TMPO $TMPC >$TMPL 2>&1
  18.      if [ $? != 0 ] ; then
  19.          log "no"
  20. -        if [ "$TRY64" != "yes" ]; then
  21. +        #Do not use -m32 for windows 32bit cross builds
  22. +        if [ "$TRY64" != "yes" -a "$MINGW" != "yes" ]; then
  23.              # NOTE: We need to modify the definitions of CC and CXX directly
  24.              #        here. Just changing the value of CFLAGS / HOST_CFLAGS
  25.              #        will not work well with the GCC toolchain scripts.
  26. @@ -802,7 +803,11 @@
  27.  {
  28.      local RET=$HOST_TAG
  29.      if [ "$MINGW" = "yes" ]; then
  30. -        RET=windows
  31. +        if [ "$TRY64" = "no" ]; then
  32. +            RET=windows
  33. +        else
  34. +            RET=windows_64
  35. +        fi
  36.      fi
  37.      case $RET in
  38.          linux-x86_64)
create a new version of this paste RAW Paste Data