Merge branch 'master' into 0.11.x

This commit is contained in:
Miku AuahDark
2019-11-24 17:39:05 +08:00
4 changed files with 25 additions and 4 deletions
+9 -2
View File
@@ -1,3 +1,10 @@
IS_NDK_R17 := $(shell python $(call my-dir)/detect_ndkrel.py $(NDK_ROOT)/source.properties 17)
IS_ANDROID_21 := $(shell python $(call my-dir)/detect_androidapi.py $(TARGET_PLATFORM) 21)
LOVE_JNI_DIR := $(call my-dir)
IS_NDK_R17 := $(shell python ${LOVE_JNI_DIR}/detect_ndkrel.py $(NDK_ROOT)/source.properties 17)
IS_ANDROID_21 := $(shell python ${LOVE_JNI_DIR}/detect_androidapi.py $(TARGET_PLATFORM) 21)
HAS_LOVE := $(shell python ${LOVE_JNI_DIR}/detect_love.py ${LOVE_JNI_DIR})
ifneq (${HAS_LOVE},yes)
$(error Missing LOVE. Make sure to initialize the submodule correctly!)
endif
include $(call all-subdir-makefiles)
+1 -1
View File
@@ -14,4 +14,4 @@ def main(argv):
print("unknown")
if __name__ == "__main__":
main(sys.argv[1:])
main(sys.argv[1:])
+14
View File
@@ -0,0 +1,14 @@
import sys
from os import path
def main(argv):
if len(argv) > 0:
if path.isdir(argv[0] + "/love") and path.isfile(argv[0] + "/love/Android.mk"):
print("yes")
else:
print("no")
else:
print("no")
if __name__ == "__main__":
main(sys.argv[1:])
+1 -1
View File
@@ -17,4 +17,4 @@ def main(argv):
print("unknown")
if __name__ == "__main__":
main(sys.argv[1:])
main(sys.argv[1:])