Merge pull request #17 from NewbieGameCoder/merge

修正msys64 无法在windows上正常的一次性编译出Android 的arm64的问题
topameng · May 14, 2019 · 8d0d486 · 8d0d486
2 parents 70f83e1 + 026a489
commit 8d0d486
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/build_arm64.sh b/build_arm64.sh
@@ -14,8 +14,14 @@ make HOST_CC="gcc -m64" CROSS=$NDKP TARGET_SYS=Linux TARGET_FLAGS="$NDKF $NDKARC
 cp ./libluajit.a ../../android/jni/libluajit.a
 make clean
 
-cd ../../android
-$NDK/ndk-build clean APP_ABI="armeabi-v7a,x86,arm64-v8a"
-$NDK/ndk-build APP_ABI="arm64-v8a"
-cp libs/arm64-v8a/libtolua.so ../Plugins/Android/libs/arm64-v8a
-$NDK/ndk-build clean APP_ABI="armeabi-v7a,x86,arm64-v8a"
+if [[ "$OSTYPE" == "msys" ]]; then
+	cd ../../
+	# can't pass $NDK to bat
+	cmd /c "link_arm64.bat"
+else
+	cd ../../android
+	$NDK/ndk-build clean APP_ABI="armeabi-v7a,x86,arm64-v8a"
+	$NDK/ndk-build APP_ABI="arm64-v8a"
+	cp libs/arm64-v8a/libtolua.so ../Plugins/Android/libs/arm64-v8a
+	$NDK/ndk-build clean APP_ABI="armeabi-v7a,x86,arm64-v8a"
+fi
diff --git a/build_x86.sh b/build_x86.sh
@@ -13,7 +13,7 @@ cp ./libluajit.a ../../android/jni/libluajit.a
 make clean
 
 cd ../../android
-ndk-build clean APP_ABI="armeabi-v7a,x86"
-ndk-build APP_ABI="x86"
+$NDK/ndk-build clean APP_ABI="armeabi-v7a,x86"
+$NDK/ndk-build APP_ABI="x86"
 cp libs/x86/libtolua.so ../Plugins/Android/libs/x86
-ndk-build clean APP_ABI="armeabi-v7a,x86"
+$NDK/ndk-build clean APP_ABI="armeabi-v7a,x86"
diff --git a/link_arm64.bat b/link_arm64.bat
@@ -0,0 +1,9 @@
+@echo off
+set ndkPath=H:/android-ndk-r10e
+cd ./android
+call %ndkPath%/ndk-build clean APP_ABI="armeabi-v7a,x86,arm64-v8a"
+call %ndkPath%/ndk-build APP_ABI="arm64-v8a"
+copy libs\arm64-v8a\libtolua.so ..\Plugins\Android\libs\arm64-v8a
+call %ndkPath%/ndk-build clean APP_ABI="armeabi-v7a,x86,arm64-v8a"
+echo Successfully linked
+exit