atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[RELEASE] new version 0.7.8 (fix error android)

Browse Source
This commit is contained in:
Edouard DUPIN 2015-10-29 21:19:29 +01:00
parent 3c186dc92e
commit fcd357e452
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lutin/z_system/lutinSystem_Android_SDK.py
View File

@ -17,10 +17,12 @@ class System(system.System):
system.System.__init__(self) system.System.__init__(self)
# create some HELP: # create some HELP:
self.help="SDK: Android SDK basic interface java\n" 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 ... # TODO : Check if the android sdk android.jar is present ...
self.valid = True self.valid = True
# todo : create a searcher of the presence of the library: # 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("-ldl")
self.add_export_flag_LD("-llog") self.add_export_flag_LD("-llog")
self.add_export_flag_LD("-landroid") self.add_export_flag_LD("-landroid")

10
lutin/z_target/lutinTarget_Android.py
View File

@ -97,8 +97,8 @@ class Target(target.Target):
if self.board_id == 0: if self.board_id == 0:
debug.debug("Auto-search BOARD-ID") debug.debug("Auto-search BOARD-ID")
for iii in reversed(range(0, 50)): for iii in reversed(range(0, 50)):
debug.debug("try: " + self.path_ndk +"/platforms/android-" + str(iii)) debug.debug("try: " + os.path.join(self.path_ndk, "platforms", "android-" + str(iii)))
if os.path.isdir(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)) debug.debug("Find BOARD-ID : " + str(iii))
self.board_id = iii self.board_id = iii
break; break;
@ -107,11 +107,11 @@ class Target(target.Target):
self.global_flags_cc.append("-D__ANDROID_BOARD_ID__=" + str(self.board_id)) self.global_flags_cc.append("-D__ANDROID_BOARD_ID__=" + str(self.board_id))
if arch == "armv5" or arch == "armv7": 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": 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": 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 True:
if self.config["compilator"] == "clang": if self.config["compilator"] == "clang":

2
setup.py
View File

@ -7,7 +7,7 @@ def readme():
# https://pypi.python.org/pypi?%3Aaction=list_classifiers # https://pypi.python.org/pypi?%3Aaction=list_classifiers
setup(name='lutin', setup(name='lutin',
version='0.7.7', version='0.7.8',
description='Lutin generic builder (might replace makefile, CMake ...)', description='Lutin generic builder (might replace makefile, CMake ...)',
long_description=readme(), long_description=readme(),
url='http://github.com/HeeroYui/lutin', url='http://github.com/HeeroYui/lutin',