Skip to content
Snippets Groups Projects
Commit def392ac authored by Dean Camera's avatar Dean Camera
Browse files

Update to latest DMBS, fix XPLAINBridge project compilation errors on full tree build.

parent 0f470dc8
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,7 @@ DMBS_BUILD_PROVIDED_MACROS += DMBS_CHECK_VERSION ERROR_IF_UNSET ERROR_IF_EMPTY E
SHELL = /bin/sh
# Current DMBS release version
DMBS_VERSION := 20160403
DMBS_VERSION := 20160717
# Macro to check the DMBS version, aborts if the given DMBS version is below the current version
DMBS_CHECK_VERSION ?= $(if $(filter-out 0, $(shell test $(DMBS_VERSION) -lt $(1); echo $$?)), , $(error DMBS version $(1) or newer required, current version is $(DMBS_VERSION)))
......
......@@ -96,7 +96,7 @@ ifneq ($(OBJDIR),.)
endif
# Create the output object file directory if it does not exist and add it to the virtual path list
$(shell mkdir $(OBJDIR) 2> /dev/null)
$(shell mkdir -p $(OBJDIR) 2> /dev/null)
VPATH += $(dir $(SRC))
endif
......
......@@ -31,13 +31,11 @@ LD_FLAGS =
# Default target
all:
OBJDIR := obj
# Since this project borrows files from the AVRISP-MKII project which may also have an
# identical OBJDIR directory, we need to enforce the use of this project's object file
# directory as the one where the build object files are to be stored by pre-pending the
# absolute path of the current project to the OBJDIR variable.
override OBJDIR:=$(shell pwd)/$(OBJDIR)
# directory as the one where the build object files are to be stored, by giving it a
# project-specific name.
OBJDIR := obj.$(TARGET)
# Include LUFA-specific DMBS extension modules
DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment