[DEBUG] correct the android build dependency order'
This commit is contained in:
parent
beb97f4bed
commit
8fa25bb8ec
@ -70,8 +70,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module
|
|||||||
target.cc,
|
target.cc,
|
||||||
"-o", file_dst,
|
"-o", file_dst,
|
||||||
target.arch,
|
target.arch,
|
||||||
target.sysroot,
|
target.sysroot]
|
||||||
target.global_include_cc]
|
|
||||||
for view in ["export", "local"]:
|
for view in ["export", "local"]:
|
||||||
try:
|
try:
|
||||||
cmd.append(tools.add_prefix("-I", path[view]["c"]))
|
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"]))
|
cmd.append(tools.add_prefix("-I", depancy.path["c"]))
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
cmd.append(target.global_include_cc)
|
||||||
try:
|
try:
|
||||||
cmd.append(get_version_compilation_flags(flags, depancy.flags))
|
cmd.append(get_version_compilation_flags(flags, depancy.flags))
|
||||||
except:
|
except:
|
||||||
|
@ -75,8 +75,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module
|
|||||||
target.xx,
|
target.xx,
|
||||||
"-o", file_dst,
|
"-o", file_dst,
|
||||||
target.arch,
|
target.arch,
|
||||||
target.sysroot,
|
target.sysroot
|
||||||
target.global_include_cc
|
|
||||||
]
|
]
|
||||||
for view in ["export", "local"]:
|
for view in ["export", "local"]:
|
||||||
for type in ["c", "c++"]:
|
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]))
|
cmd.append(tools.add_prefix("-I",depancy.path[type]))
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
cmd.append(target.global_include_cc)
|
||||||
try:
|
try:
|
||||||
cmd.append(get_version_compilation_flags(flags, depancy.flags))
|
cmd.append(get_version_compilation_flags(flags, depancy.flags))
|
||||||
except:
|
except:
|
||||||
|
@ -65,8 +65,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module
|
|||||||
target.cc,
|
target.cc,
|
||||||
"-o", file_dst,
|
"-o", file_dst,
|
||||||
target.arch,
|
target.arch,
|
||||||
target.sysroot,
|
target.sysroot]
|
||||||
target.global_include_cc]
|
|
||||||
for view in ["export", "local"]:
|
for view in ["export", "local"]:
|
||||||
try:
|
try:
|
||||||
cmd.append(tools.add_prefix("-I", path[view]["c"]))
|
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"]))
|
cmd.append(tools.add_prefix("-I", depancy.path["c"]))
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
cmd.append(target.global_include_cc)
|
||||||
try:
|
try:
|
||||||
cmd.append(target.global_flags["c"])
|
cmd.append(target.global_flags["c"])
|
||||||
except:
|
except:
|
||||||
|
@ -174,13 +174,15 @@ class Target(target.Target):
|
|||||||
# -----------------------
|
# -----------------------
|
||||||
self.add_flag("c", [
|
self.add_flag("c", [
|
||||||
"-mfpu=neon",
|
"-mfpu=neon",
|
||||||
|
"-march=armv7-a",
|
||||||
"-mfloat-abi=softfp",
|
"-mfloat-abi=softfp",
|
||||||
"-D__ARM_ARCH_7__",
|
"-D__ARM_ARCH_7__",
|
||||||
"-D__ARM_NEON__"
|
"-D__ARM_NEON__"
|
||||||
])
|
])
|
||||||
self.add_flag("link", [
|
self.add_flag("link", [
|
||||||
"-mfpu=neon",
|
"-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)
|
# 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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user