From fcd357e452851da8a9236aa0a7578a9ad4f7cbfe Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 29 Oct 2015 21:19:29 +0100 Subject: [PATCH] [RELEASE] new version 0.7.8 (fix error android) --- lutin/z_system/lutinSystem_Android_SDK.py | 4 +++- lutin/z_target/lutinTarget_Android.py | 10 +++++----- setup.py | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lutin/z_system/lutinSystem_Android_SDK.py b/lutin/z_system/lutinSystem_Android_SDK.py index 309ade9..c542981 100644 --- a/lutin/z_system/lutinSystem_Android_SDK.py +++ b/lutin/z_system/lutinSystem_Android_SDK.py @@ -17,10 +17,12 @@ class System(system.System): system.System.__init__(self) # create some HELP: self.help="SDK: Android SDK basic interface java\n" + # jar file: + jar_file_path=os.path.join(target.path_sdk, "platforms", "android-" + str(target.board_id), "android.jar") # TODO : Check if the android sdk android.jar is present ... self.valid = True # todo : create a searcher of the presence of the library: - self.add_export_SRC(target.path_sdk + "/platforms/android-" + str(target.boardId) + "/android.jar") + self.add_export_SRC(jar_file_path) self.add_export_flag_LD("-ldl") self.add_export_flag_LD("-llog") self.add_export_flag_LD("-landroid") diff --git a/lutin/z_target/lutinTarget_Android.py b/lutin/z_target/lutinTarget_Android.py index ab3f786..e07ef7d 100644 --- a/lutin/z_target/lutinTarget_Android.py +++ b/lutin/z_target/lutinTarget_Android.py @@ -97,8 +97,8 @@ class Target(target.Target): if self.board_id == 0: debug.debug("Auto-search BOARD-ID") for iii in reversed(range(0, 50)): - debug.debug("try: " + self.path_ndk +"/platforms/android-" + str(iii)) - if os.path.isdir(self.path_ndk +"/platforms/android-" + str(iii)): + debug.debug("try: " + os.path.join(self.path_ndk, "platforms", "android-" + str(iii))) + if os.path.isdir(os.path.join(self.path_ndk, "platforms", "android-" + str(iii))): debug.debug("Find BOARD-ID : " + str(iii)) self.board_id = iii break; @@ -107,11 +107,11 @@ class Target(target.Target): self.global_flags_cc.append("-D__ANDROID_BOARD_ID__=" + str(self.board_id)) if arch == "armv5" or arch == "armv7": - self.global_include_cc.append("-I" + self.path_ndk +"/platforms/android-" + str(self.board_id) + "/arch-arm/usr/include/") + self.global_include_cc.append("-I" + os.path.join(self.path_ndk, "platforms", "android-" + str(self.board_id), "arch-arm", "usr", "include")) elif arch == "mips": - self.global_include_cc.append("-I" + self.path_ndk +"/platforms/android-" + str(self.board_id) + "/arch-mips/usr/include/") + self.global_include_cc.append("-I" + os.path.join(self.path_ndk, "platforms", "android-" + str(self.board_id), "arch-mips", "usr", "include")) elif arch == "x86": - self.global_include_cc.append("-I" + self.path_ndk +"/platforms/android-" + str(self.board_id) + "/arch-x86/usr/include/") + self.global_include_cc.append("-I" + os.path.join(self.path_ndk, "platforms", "android-" + str(self.board_id), "arch-x86", "usr", "include")) if True: if self.config["compilator"] == "clang": diff --git a/setup.py b/setup.py index a5ea987..3ddb668 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ def readme(): # https://pypi.python.org/pypi?%3Aaction=list_classifiers setup(name='lutin', - version='0.7.7', + version='0.7.8', description='Lutin generic builder (might replace makefile, CMake ...)', long_description=readme(), url='http://github.com/HeeroYui/lutin',