platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/reversed-cppath' into develop

Browse Source
This commit is contained in:
Ivan Kravets
2015-05-25 19:35:48 +03:00
parent 146d430695 9ba3136a24
commit 96ce0692f8
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
platformio/builder/tools/platformio.py
View File

@ -74,7 +74,7 @@ def BuildFirmware(env):
return firmenv.Program( return firmenv.Program(
join("$BUILD_DIR", "firmware"), join("$BUILD_DIR", "firmware"),
[firmenv.GlobCXXFiles(vdir) for vdir in vdirs], [firmenv.GlobCXXFiles(vdir) for vdir in vdirs],
LIBS=list(env.get("LIBS", []) + deplibs)[::-1], LIBS=env.get("LIBS", []) + deplibs,
LIBPATH=env.get("LIBPATH", []) + ["$BUILD_DIR"], LIBPATH=env.get("LIBPATH", []) + ["$BUILD_DIR"],
PROGSUFFIX=".elf" PROGSUFFIX=".elf"
) )
@ -288,17 +288,15 @@ def BuildDependentLibraries(env, src_dir): # pylint: disable=R0914
# end internal prototypes # end internal prototypes
deplibs = _get_dep_libs(src_dir) deplibs = _get_dep_libs(src_dir)
env.Prepend( for l, ld in deplibs:
CPPPATH=[join("$BUILD_DIR", l) for (l, _) in deplibs] env.Append(
) CPPPATH=[join("$BUILD_DIR", l)]
)
# add automatically "utility" dir from the lib (Arduino issue) # add automatically "utility" dir from the lib (Arduino issue)
env.Prepend( if isdir(join(ld, "utility")):
CPPPATH=[ env.Append(
join("$BUILD_DIR", l, "utility") for (l, ld) in deplibs CPPPATH=[join("$BUILD_DIR", l, "utility")]
if isdir(join(ld, "utility")) )
]
)
libs = [] libs = []
for (libname, inc_dir) in deplibs: for (libname, inc_dir) in deplibs: