Skip to content

feat(options): add SRC_DIR var to allow sources to live in a subfolder #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(options): add SRC_DIR var to allow sources to live in a subfolder #406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Arduino.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,12 +762,12 @@ endif
########################################################################
# Local sources

Copy link

@alissa-huskey alissa-huskey Nov 13, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excited to see this!

May I suggest:

Suggested change
SRC_DIR ?= $(dir $(realpath $(firstword $(MAKEFILE_LIST))))

This would default SRC_DIR to the location of the users Makefile. Since it would then always be defined, you could then print it in configuration vars without it being weird and use slash notation in your wildcard searches (if you cared to).

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 $(SRC_DIR)*.c)
LOCAL_CPP_SRCS ?= $(wildcard $(SRC_DIR)*.cpp)
LOCAL_CC_SRCS ?= $(wildcard $(SRC_DIR)*.cc)
LOCAL_PDE_SRCS ?= $(wildcard $(SRC_DIR)*.pde)
LOCAL_INO_SRCS ?= $(wildcard $(SRC_DIR)*.ino)
LOCAL_AS_SRCS ?= $(wildcard $(SRC_DIR)*.S)
LOCAL_SRCS = $(LOCAL_C_SRCS) $(LOCAL_CPP_SRCS) \
$(LOCAL_CC_SRCS) $(LOCAL_PDE_SRCS) \
$(LOCAL_INO_SRCS) $(LOCAL_AS_SRCS)
Expand Down