Browse Source

Name Android buildvm tool for LuaJIT library differently based on ABI.

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
c711d450ed
2 changed files with 2 additions and 2 deletions
  1. 1 1
      Rakefile
  2. 1 1
      Source/ThirdParty/LuaJIT/CMakeLists.txt

+ 1 - 1
Rakefile

@@ -311,7 +311,7 @@ def makefile_ci
     end
     end
     # LuaJIT on Android build requires tolua++ and buildvm-android tools to be built natively first
     # LuaJIT on Android build requires tolua++ and buildvm-android tools to be built natively first
     system "cd Build/ThirdParty/toluapp/src/bin && make -j$NUMJOBS" or abort 'Failed to build tolua++ tool'
     system "cd Build/ThirdParty/toluapp/src/bin && make -j$NUMJOBS" or abort 'Failed to build tolua++ tool'
-    system "cd Build/ThirdParty/LuaJIT/generated/buildvm-android && make -j$NUMJOBS" or abort 'Failed to build buildvm-android tool'
+    system "cd Build/ThirdParty/LuaJIT/generated/buildvm-android-#{ENV['ABI']} && make -j$NUMJOBS" or abort 'Failed to build buildvm-android tool'
     # Reconfigure Android build one more time now that we have the tools built
     # Reconfigure Android build one more time now that we have the tools built
     ENV['SKIP_NATIVE'] = '1'
     ENV['SKIP_NATIVE'] = '1'
     system './cmake_gcc.sh' or abort 'Failed to reconfigure Urho3D library for Android build'
     system './cmake_gcc.sh' or abort 'Failed to reconfigure Urho3D library for Android build'

+ 1 - 1
Source/ThirdParty/LuaJIT/CMakeLists.txt

@@ -155,7 +155,7 @@ if (CMAKE_CROSSCOMPILING OR IOS)
     If (IOS)
     If (IOS)
         set (BUILDVM_X buildvm-ios)
         set (BUILDVM_X buildvm-ios)
     elseif (ANDROID)
     elseif (ANDROID)
-        set (BUILDVM_X buildvm-android)
+        set (BUILDVM_X buildvm-android-${ANDROID_ABI})
     elseif (RASPI)
     elseif (RASPI)
         set (BUILDVM_X buildvm-raspi)
         set (BUILDVM_X buildvm-raspi)
     elseif (MINGW)
     elseif (MINGW)