From a128ce20209284393ca76cc9e3851707dc0be143 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Sun, 1 Jul 2012 12:52:36 +0200 Subject: [PATCH] allow user to choose source files --- .gitignore | 1 + arduino-mk/Arduino.mk | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7294495..06cff06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.o build-cli +/.project diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index dd0db28..16e5929 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -3,6 +3,10 @@ # Arduino command line tools Makefile # System part (i.e. project independent) # +# Copyright (C) 2012 Gabriel Fournier , based on +# - M J Oldfield work: https://github.com/mjoldfield/Arduino-Makefile +# - sudar work: https://github.com/sudar/Arduino-Makefile.git +# # Copyright (C) 2010,2011,2012 Martin Oldfield , based on # work that is copyright Nicholas Zambetti, David A. Mellis & Hernando # Barragan. @@ -77,7 +81,11 @@ # - Moved the reset target to Perl for # clarity and better error handling (ex # Daniele Vergini) -# +# +# 0.9.1 01.vii.2012 Gaftech +# - Allow user to choose source files +# (LOCAL_*_SRCS flags) +# ######################################################################## # # PATHS YOU NEED TO SET UP @@ -421,12 +429,12 @@ OBJDIR = build-cli ######################################################################## # Local sources # -LOCAL_C_SRCS = $(wildcard *.c) -LOCAL_CPP_SRCS = $(wildcard *.cpp) -LOCAL_CC_SRCS = $(wildcard *.cc) -LOCAL_PDE_SRCS = $(wildcard *.pde) -LOCAL_INO_SRCS = $(wildcard *.ino) -LOCAL_AS_SRCS = $(wildcard *.S) +LOCAL_C_SRCS ?= $(wildcard *.c) +LOCAL_CPP_SRCS ?= $(wildcard *.cpp) +LOCAL_CC_SRCS ?= $(wildcard *.cc) +LOCAL_PDE_SRCS ?= $(wildcard *.pde) +LOCAL_INO_SRCS ?= $(wildcard *.ino) +LOCAL_AS_SRCS ?= $(wildcard *.S) LOCAL_OBJ_FILES = $(LOCAL_C_SRCS:.c=.o) $(LOCAL_CPP_SRCS:.cpp=.o) \ $(LOCAL_CC_SRCS:.cc=.o) $(LOCAL_PDE_SRCS:.pde=.o) \ $(LOCAL_INO_SRCS:.ino=.o) $(LOCAL_AS_SRCS:.S=.o)