diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/templates/board.mk b/toolchains/arduino/org.eclipse.cdt.arduino.core/templates/board.mk index 0d1b43ef3f6..e2c8974b3d8 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core/templates/board.mk +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/templates/board.mk @@ -34,14 +34,14 @@ LIBRARIES_OBJS = \ <#list libraries_srcs as file> <#assign cpp = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.cpp")> <#if !cpp> -<#assign cpp = file?matches("${platform_path}/libraries/(.*?)/.*?/(.*)\\.cpp")> +<#assign cpp = file?matches("${platform_path}/libraries/(.*?)/(.*)\\.cpp")> <#if cpp> ${build_path}/libraries/${cpp?groups[1]}/${cpp?groups[2]}.cpp.o \ <#assign c = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.c")> <#if !c> -<#assign c = file?matches("${platform_path}/libraries/(.*?)/.*?/(.*)\\.c")> +<#assign c = file?matches("${platform_path}/libraries/(.*?)/(.*)\\.c")> <#if c> ${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> <#assign cpp = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.cpp")> <#if !cpp> -<#assign cpp = file?matches("${platform_path}/libraries/(.*?)/.*?/(.*)\\.cpp")> +<#assign cpp = file?matches("${platform_path}/libraries/(.*?)/(.*)\\.cpp")> <#if cpp> ${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} <#assign c = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.c")> <#if !c> -<#assign c = file?matches("${platform_path}/libraries/(.*?)/.*?/(.*)\\.c")> +<#assign c = file?matches("${platform_path}/libraries/(.*?)/(.*)\\.c")> <#if c> ${build_path}/libraries/${c?groups[1]}/${c?groups[2]}.c.o: ${file}