mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 23:55:26 +02:00
Code Issues Wiki Activity

Bug 480256 - Fix pattern for finding platform libraries

Browse source 
Change-Id: I781651c1204a7fb348271b69817260f0bf3beb81
This commit is contained in:
Doug Schaefer 2015-10-20 21:20:45 -04:00 • committed by Gerrit Code Review @ Eclipse.org
parent edd2025baa
commit a88d0eb0d9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toolchains/arduino/org.eclipse.cdt.arduino.core/templates/board.mk
View file

@ -34,14 +34,14 @@ LIBRARIES_OBJS = \
<#list libraries_srcs as file> <#list libraries_srcs as file>
<#assign cpp = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.cpp")> <#assign cpp = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.cpp")>
<#if !cpp> <#if !cpp>
<#assign cpp = file?matches("${platform_path}/libraries/(.*?)/.*?/(.*)\\.cpp")> <#assign cpp = file?matches("${platform_path}/libraries/(.*?)/(.*)\\.cpp")>
</#if> </#if>
<#if cpp> <#if cpp>
${build_path}/libraries/${cpp?groups[1]}/${cpp?groups[2]}.cpp.o \ ${build_path}/libraries/${cpp?groups[1]}/${cpp?groups[2]}.cpp.o \
</#if> </#if>
<#assign c = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.c")> <#assign c = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.c")>
<#if !c> <#if !c>
<#assign c = file?matches("${platform_path}/libraries/(.*?)/.*?/(.*)\\.c")> <#assign c = file?matches("${platform_path}/libraries/(.*?)/(.*)\\.c")>
</#if> </#if>
<#if c> <#if c>
${build_path}/libraries/${c?groups[1]}/${c?groups[2]}.c.o \ ${build_path}/libraries/${c?groups[1]}/${c?groups[2]}.c.o \
@ -107,7 +107,7 @@ ${build_path}/platform/${S?groups[1]}.S.o: ${file}
<#list libraries_srcs as file> <#list libraries_srcs as file>
<#assign cpp = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.cpp")> <#assign cpp = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.cpp")>
<#if !cpp> <#if !cpp>
<#assign cpp = file?matches("${platform_path}/libraries/(.*?)/.*?/(.*)\\.cpp")> <#assign cpp = file?matches("${platform_path}/libraries/(.*?)/(.*)\\.cpp")>
</#if> </#if>
<#if cpp> <#if cpp>
${build_path}/libraries/${cpp?groups[1]}/${cpp?groups[2]}.cpp.o: ${file} ${build_path}/libraries/${cpp?groups[1]}/${cpp?groups[2]}.cpp.o: ${file}
@ -117,7 +117,7 @@ ${build_path}/libraries/${cpp?groups[1]}/${cpp?groups[2]}.cpp.o: ${file}
</#if> </#if>
<#assign c = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.c")> <#assign c = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.c")>
<#if !c> <#if !c>
<#assign c = file?matches("${platform_path}/libraries/(.*?)/.*?/(.*)\\.c")> <#assign c = file?matches("${platform_path}/libraries/(.*?)/(.*)\\.c")>
</#if> </#if>
<#if c> <#if c>
${build_path}/libraries/${c?groups[1]}/${c?groups[2]}.c.o: ${file} ${build_path}/libraries/${c?groups[1]}/${c?groups[2]}.c.o: ${file}