Unverified Commit b5c251a7 authored by Dean Camera's avatar Dean Camera Committed by GitHub
Browse files

Merge pull request #108 from NicoHood/include_guard

Added include guards for DMBS build modules (thanks to Nico Hood).
parents 2f00be53 29c8f21f
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
# www.lufa-lib.org # www.lufa-lib.org
# #
# Include Guard
ifeq ($(filter LUFA_GCC, $(DMBS_BUILD_MODULES)),)
DMBS_BUILD_MODULES += LUFA_GCC DMBS_BUILD_MODULES += LUFA_GCC
DMBS_BUILD_TARGETS += DMBS_BUILD_TARGETS +=
DMBS_BUILD_MANDATORY_VARS += LUFA_PATH ARCH F_USB DMBS_BUILD_MANDATORY_VARS += LUFA_PATH ARCH F_USB
...@@ -41,3 +44,5 @@ LUFA_CXX_DEFINES = -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)U ...@@ -41,3 +44,5 @@ LUFA_CXX_DEFINES = -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)U
# LUFA specific standard build options # LUFA specific standard build options
C_FLAGS += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS) C_FLAGS += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS)
CPP_FLAGS += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS) CPP_FLAGS += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS)
endif
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
# www.lufa-lib.org # www.lufa-lib.org
# #
# Include Guard
ifeq ($(filter LUFA_SOURCES, $(DMBS_BUILD_MODULES)),)
DMBS_BUILD_MODULES += LUFA_SOURCES DMBS_BUILD_MODULES += LUFA_SOURCES
DMBS_BUILD_TARGETS += DMBS_BUILD_TARGETS +=
DMBS_BUILD_MANDATORY_VARS += LUFA_PATH ARCH DMBS_BUILD_MANDATORY_VARS += LUFA_PATH ARCH
...@@ -93,3 +96,5 @@ LUFA_SRC_ALL_FILES := $(LUFA_SRC_USB) \ ...@@ -93,3 +96,5 @@ LUFA_SRC_ALL_FILES := $(LUFA_SRC_USB) \
$(LUFA_SRC_SERIAL) \ $(LUFA_SRC_SERIAL) \
$(LUFA_SRC_TWI) \ $(LUFA_SRC_TWI) \
$(LUFA_SRC_PLATFORM) $(LUFA_SRC_PLATFORM)
endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment