From 8fa25bb8ec62a2dfeb05176e54c8b0e3123b4708 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 1 Aug 2016 00:28:18 +0200 Subject: [PATCH] [DEBUG] correct the android build dependency order' --- lutin/z_builder/lutinBuilder_c.py | 4 ++-- lutin/z_builder/lutinBuilder_cpp.py | 4 ++-- lutin/z_builder/lutinBuilder_s.py | 4 ++-- lutin/z_target/lutinTarget_Android.py | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lutin/z_builder/lutinBuilder_c.py b/lutin/z_builder/lutinBuilder_c.py index 8d2f2c4..5d59344 100644 --- a/lutin/z_builder/lutinBuilder_c.py +++ b/lutin/z_builder/lutinBuilder_c.py @@ -70,8 +70,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module target.cc, "-o", file_dst, target.arch, - target.sysroot, - target.global_include_cc] + target.sysroot] for view in ["export", "local"]: try: cmd.append(tools.add_prefix("-I", path[view]["c"])) @@ -81,6 +80,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module cmd.append(tools.add_prefix("-I", depancy.path["c"])) except: pass + cmd.append(target.global_include_cc) try: cmd.append(get_version_compilation_flags(flags, depancy.flags)) except: diff --git a/lutin/z_builder/lutinBuilder_cpp.py b/lutin/z_builder/lutinBuilder_cpp.py index b82937f..cf91994 100644 --- a/lutin/z_builder/lutinBuilder_cpp.py +++ b/lutin/z_builder/lutinBuilder_cpp.py @@ -75,8 +75,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module target.xx, "-o", file_dst, target.arch, - target.sysroot, - target.global_include_cc + target.sysroot ] for view in ["export", "local"]: for type in ["c", "c++"]: @@ -89,6 +88,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module cmd.append(tools.add_prefix("-I",depancy.path[type])) except: pass + cmd.append(target.global_include_cc) try: cmd.append(get_version_compilation_flags(flags, depancy.flags)) except: diff --git a/lutin/z_builder/lutinBuilder_s.py b/lutin/z_builder/lutinBuilder_s.py index 49db426..75aea19 100644 --- a/lutin/z_builder/lutinBuilder_s.py +++ b/lutin/z_builder/lutinBuilder_s.py @@ -65,8 +65,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module target.cc, "-o", file_dst, target.arch, - target.sysroot, - target.global_include_cc] + target.sysroot] for view in ["export", "local"]: try: cmd.append(tools.add_prefix("-I", path[view]["c"])) @@ -76,6 +75,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module cmd.append(tools.add_prefix("-I", depancy.path["c"])) except: pass + cmd.append(target.global_include_cc) try: cmd.append(target.global_flags["c"]) except: diff --git a/lutin/z_target/lutinTarget_Android.py b/lutin/z_target/lutinTarget_Android.py index e3848d1..5f17ee6 100644 --- a/lutin/z_target/lutinTarget_Android.py +++ b/lutin/z_target/lutinTarget_Android.py @@ -174,13 +174,15 @@ class Target(target.Target): # ----------------------- self.add_flag("c", [ "-mfpu=neon", + "-march=armv7-a", "-mfloat-abi=softfp", "-D__ARM_ARCH_7__", "-D__ARM_NEON__" ]) self.add_flag("link", [ "-mfpu=neon", - "-mfloat-abi=softfp" + "-mfloat-abi=softfp", + "-Wl,--fix-cortex-a8", ]) # the -mthumb must be set for all the android produc, some ot the not work coretly without this one ... (all android code is generated with this flags)