From b18523d6908db8504eb7ee308a3088f55c1c897e Mon Sep 17 00:00:00 2001 From: James Duley Date: Sat, 18 Jul 2015 13:10:19 +1200 Subject: [PATCH] Added option for config file. Things the can be added to config file are: export PATH := /usr/lib/ccache/bin:$(PATH) GCS_OPTS := XXX etc --- .gitignore | 4 ++++ Makefile | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index d045c8b67..c577e153d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,10 @@ /tools /build /3rdparty + +# Ignore user config +config + # Exclude temporary and system files Thumbs.db diff --git a/Makefile b/Makefile index c3667097f..4df97505a 100644 --- a/Makefile +++ b/Makefile @@ -140,6 +140,9 @@ else ifeq ($(UNAME), Windows) UAVOBJGENERATOR = $(BUILD_DIR)/uavobjgenerator/uavobjgenerator.exe endif +CONFIG_FILE := config +-include $(CONFIG_FILE) + ############################## # # All targets