API tools faq
paste
Guest User

Untitled

a guest
Feb 25th, 2018
90
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.37 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/Android/buildlibs/armeabi-v7a/ndkenv b/Android/buildlibs/armeabi-v7a/ndkenv
  2. index cf9fdfb..6e3d130 100644
  3. --- a/Android/buildlibs/armeabi-v7a/ndkenv
  4. +++ b/Android/buildlibs/armeabi-v7a/ndkenv
  5. @@ -5,7 +5,7 @@ get_abs_path() {
  6.  
  7. unset DEVROOT SDKROOT CFLAGS CC LD CPP CXX AR AS NM CXXCPP RANLIB LDFLAGS CPPFLAGS CXXFLAGS
  8.  
  9. -export NDK_PLATFORM_ROOT=/opt/android-ndk-r10e-standalone/android-9/arm
  10. +export NDK_PLATFORM_ROOT=~/Android/Sdk/ndk-bundle/platforms/android-14/arm
  11. export NDK_PLATFORM_NAME=armeabi-v7a
  12. export NDK_HOST_NAME=arm-linux-androideabi
  13. export NDK_ADDITIONAL_LIBRARY_PATH=$(get_abs_path "../../nativelibs/$NDK_PLATFORM_NAME")
  14. @@ -15,3 +15,5 @@ export ACLOCAL_PATH=$NDK_ADDITIONAL_LIBRARY_PATH/share/aclocal
  15.  
  16. export NDK_CFLAGS=" -mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 "
  17. export NDK_LDFLAGS=" -march=armv7-a -Wl,--fix-cortex-a8 "
  18. +export CC=~/Android/Sdk/ndk-bundle/platforms/android-14/arm/bin/arm-linux-androideabi-gcc
  19. +export CXX=~/Android/Sdk/ndk-bundle/platforms/android-14/arm/bin/arm-linux-androideabi-g++
  20. diff --git a/Android/buildlibs/armeabi-v7a/ogg.sh b/Android/buildlibs/armeabi-v7a/ogg.sh
  21. index 53dd200..8f058f5 100755
  22. --- a/Android/buildlibs/armeabi-v7a/ogg.sh
  23. +++ b/Android/buildlibs/armeabi-v7a/ogg.sh
  24. @@ -11,7 +11,7 @@ tar xf ../../../libsrc/libogg-1.3.2.tar.gz --strip-components=1 -C $SRC_DIR
  25.  
  26. pushd $SRC_DIR
  27.  
  28. -export CFLAGS="$NDK_CFLAGS -fsigned-char"
  29. +export CFLAGS="$NDK_CFLAGS -fsigned-char -D__ANDROID_API__=\$API"
  30. export LDFLAGS="$NDK_LDFLAGS"
  31.  
  32. ./configure --host=$NDK_HOST_NAME --prefix=$NDK_ADDITIONAL_LIBRARY_PATH --disable-shared
  33. diff --git a/Android/buildlibs/armeabi/ndkenv b/Android/buildlibs/armeabi/ndkenv
  34. index 0df6781..db11d13 100644
  35. --- a/Android/buildlibs/armeabi/ndkenv
  36. +++ b/Android/buildlibs/armeabi/ndkenv
  37. @@ -5,7 +5,7 @@ get_abs_path() {
  38.  
  39. unset DEVROOT SDKROOT CFLAGS CC LD CPP CXX AR AS NM CXXCPP RANLIB LDFLAGS CPPFLAGS CXXFLAGS
  40.  
  41. -export NDK_PLATFORM_ROOT=/opt/android-ndk-r10e-standalone/android-9/arm
  42. +export NDK_PLATFORM_ROOT=~/Android/Sdk/ndk-bundle/platforms/android-14/arm
  43. export NDK_PLATFORM_NAME=armeabi
  44. export NDK_HOST_NAME=arm-linux-androideabi
  45. export NDK_ADDITIONAL_LIBRARY_PATH=$(get_abs_path "../../nativelibs/$NDK_PLATFORM_NAME")
  46. @@ -14,3 +14,5 @@ export PKG_CONFIG_PATH=$NDK_ADDITIONAL_LIBRARY_PATH/lib/pkgconfig
  47. export ACLOCAL_PATH=$NDK_ADDITIONAL_LIBRARY_PATH/share/aclocal
  48.  
  49. export NDK_CFLAGS=" -mthumb "
  50. +export CC=~/Android/Sdk/ndk-bundle/platforms/android-14/arm/bin/arm-linux-androideabi-gcc
  51. +export CXX=~/Android/Sdk/ndk-bundle/platforms/android-14/arm/bin/arm-linux-androideabi-g++
  52. diff --git a/Android/buildlibs/armeabi/ogg.sh b/Android/buildlibs/armeabi/ogg.sh
  53. index 21062a3..56ed267 100755
  54. --- a/Android/buildlibs/armeabi/ogg.sh
  55. +++ b/Android/buildlibs/armeabi/ogg.sh
  56. @@ -11,7 +11,7 @@ tar xf ../../../libsrc/libogg-1.3.2.tar.gz --strip-components=1 -C $SRC_DIR
  57.  
  58. pushd $SRC_DIR
  59.  
  60. -export CFLAGS="$NDK_CFLAGS -fsigned-char"
  61. +export CFLAGS="$NDK_CFLAGS -fsigned-char -D__ANDROID_API__=\$API"
  62. export LDFLAGS="$NDK_LDFLAGS"
  63.  
  64. ./configure --host=$NDK_HOST_NAME --prefix=$NDK_ADDITIONAL_LIBRARY_PATH --disable-shared
  65. diff --git a/Android/buildlibs/makestandalones.sh b/Android/buildlibs/makestandalones.sh
  66. index 7f327cd..d4ecd64 100755
  67. --- a/Android/buildlibs/makestandalones.sh
  68. +++ b/Android/buildlibs/makestandalones.sh
  69. @@ -5,18 +5,18 @@
  70. set -e
  71.  
  72. # Last committed pre-compiled libs were with R8
  73. -NDK_HOME=/opt/android-ndk-r10e
  74. +NDK_HOME=~/Android/Sdk/ndk-bundle
  75.  
  76. # android-9 is minimum to support mips and x86
  77. -PLATFORM=android-9
  78. +PLATFORM=android-14
  79.  
  80. # standalone toolchains cannot share same directory
  81. -NDK_STANDALONE=/opt/android-ndk-r10e-standalone/$PLATFORM
  82. +NDK_STANDALONE=~/Android/Sdk/ndk-bundle/platforms/$PLATFORM
  83.  
  84. for arch in arm x86 mips
  85. do
  86. INSTALL_DIR=$NDK_STANDALONE/$arch
  87. mkdir -p $INSTALL_DIR
  88. - $NDK_HOME/build/tools/make-standalone-toolchain.sh --platform=$PLATFORM --install-dir=$INSTALL_DIR --arch=$arch
  89. + $NDK_HOME/build/tools/make-standalone-toolchain.sh --force --platform=$PLATFORM --install-dir=$INSTALL_DIR --arch=$arch
  90. done
  91.  
  92. diff --git a/Android/buildlibs/mips/ndkenv b/Android/buildlibs/mips/ndkenv
  93. index f1f7c78..8156536 100644
  94. --- a/Android/buildlibs/mips/ndkenv
  95. +++ b/Android/buildlibs/mips/ndkenv
  96. @@ -5,7 +5,7 @@ get_abs_path() {
  97.  
  98. unset DEVROOT SDKROOT CFLAGS CC LD CPP CXX AR AS NM CXXCPP RANLIB LDFLAGS CPPFLAGS CXXFLAGS
  99.  
  100. -export NDK_PLATFORM_ROOT=/opt/android-ndk-r10e-standalone/android-9/mips
  101. +export NDK_PLATFORM_ROOT=~/Android/Sdk/ndk-bundle/platforms/android-14/mips
  102. export NDK_PLATFORM_NAME=mips
  103. export NDK_HOST_NAME=mipsel-linux-android
  104. export NDK_ADDITIONAL_LIBRARY_PATH=$(get_abs_path "../../nativelibs/$NDK_PLATFORM_NAME")
  105. @@ -15,3 +15,5 @@ export ACLOCAL_PATH=$NDK_ADDITIONAL_LIBRARY_PATH/share/aclocal
  106.  
  107. # NDK before R8b turns on "-mno-shared" in MIPS toolchain which disables -fpic
  108. export NDK_CFLAGS=" -fpic "
  109. +export CC=~/Android/Sdk/ndk-bundle/platforms/android-14/mips/bin/mipsel-linux-android-gcc
  110. +export CXX=~/Android/Sdk/ndk-bundle/platforms/android-14/mips/bin/mipsel-linux-android-g++
  111. diff --git a/Android/buildlibs/mips/ogg.sh b/Android/buildlibs/mips/ogg.sh
  112. index 53dd200..8f058f5 100755
  113. --- a/Android/buildlibs/mips/ogg.sh
  114. +++ b/Android/buildlibs/mips/ogg.sh
  115. @@ -11,7 +11,7 @@ tar xf ../../../libsrc/libogg-1.3.2.tar.gz --strip-components=1 -C $SRC_DIR
  116.  
  117. pushd $SRC_DIR
  118.  
  119. -export CFLAGS="$NDK_CFLAGS -fsigned-char"
  120. +export CFLAGS="$NDK_CFLAGS -fsigned-char -D__ANDROID_API__=\$API"
  121. export LDFLAGS="$NDK_LDFLAGS"
  122.  
  123. ./configure --host=$NDK_HOST_NAME --prefix=$NDK_ADDITIONAL_LIBRARY_PATH --disable-shared
  124. diff --git a/Android/buildlibs/x86/ndkenv b/Android/buildlibs/x86/ndkenv
  125. index d0710f4..ea2176f 100644
  126. --- a/Android/buildlibs/x86/ndkenv
  127. +++ b/Android/buildlibs/x86/ndkenv
  128. @@ -5,10 +5,14 @@ get_abs_path() {
  129.  
  130. unset DEVROOT SDKROOT CFLAGS CC LD CPP CXX AR AS NM CXXCPP RANLIB LDFLAGS CPPFLAGS CXXFLAGS
  131.  
  132. -export NDK_PLATFORM_ROOT=/opt/android-ndk-r10e-standalone/android-9/x86
  133. +export NDK_PLATFORM_ROOT=~/Android/Sdk/ndk-bundle/platforms/android-14/x86
  134. export NDK_PLATFORM_NAME=x86
  135. export NDK_HOST_NAME=i686-linux-android
  136. export NDK_ADDITIONAL_LIBRARY_PATH=$(get_abs_path "../../nativelibs/$NDK_PLATFORM_NAME")
  137. export PATH=$NDK_PLATFORM_ROOT/bin:$PATH
  138. export PKG_CONFIG_PATH=$NDK_ADDITIONAL_LIBRARY_PATH/lib/pkgconfig
  139. export ACLOCAL_PATH=$NDK_ADDITIONAL_LIBRARY_PATH/share/aclocal
  140. +
  141. +
  142. +export CC=~/Android/Sdk/ndk-bundle/platforms/android-14/x86/bin/i686-linux-android-gcc
  143. +export CXX=~/Android/Sdk/ndk-bundle/platforms/android-14/x86/bin/i686-linux-android-g++
  144. diff --git a/Android/buildlibs/x86/ogg.sh b/Android/buildlibs/x86/ogg.sh
  145. index 53dd200..8f058f5 100755
  146. --- a/Android/buildlibs/x86/ogg.sh
  147. +++ b/Android/buildlibs/x86/ogg.sh
  148. @@ -11,7 +11,7 @@ tar xf ../../../libsrc/libogg-1.3.2.tar.gz --strip-components=1 -C $SRC_DIR
  149.  
  150. pushd $SRC_DIR
  151.  
  152. -export CFLAGS="$NDK_CFLAGS -fsigned-char"
  153. +export CFLAGS="$NDK_CFLAGS -fsigned-char -D__ANDROID_API__=\$API"
  154. export LDFLAGS="$NDK_LDFLAGS"
  155.  
  156. ./configure --host=$NDK_HOST_NAME --prefix=$NDK_ADDITIONAL_LIBRARY_PATH --disable-shared
  157. diff --git a/Android/patches/liblua.patch b/Android/patches/liblua.patch
  158. index 4d040bc..e717f0d 100644
  159. --- a/Android/patches/liblua.patch
  160. +++ b/Android/patches/liblua.patch
  161. @@ -20,7 +20,8 @@ diff -Naur src/Makefile src/Makefile
  162. PLAT= none
  163.  
  164. -CC= gcc
  165. - CFLAGS= -O2 -Wall $(MYCFLAGS)
  166. +-CFLAGS= -O2 -Wall $(MYCFLAGS)
  167. ++CFLAGS= -O2 -Wall $(MYCFLAGS) -D__ANDROID_API__=$AP
  168. AR= ar rcu
  169. RANLIB= ranlib
  170. RM= rm -f
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!