X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/ce5f5bd1c3285fe2dd9f554503bee12dca4d60e4..refs/heads/master:/BuildTests/ModuleTest/makefile.test?ds=sidebyside

diff --git a/BuildTests/ModuleTest/makefile.test b/BuildTests/ModuleTest/makefile.test
index 55f3941bf..7c442aaa3 100644
--- a/BuildTests/ModuleTest/makefile.test
+++ b/BuildTests/ModuleTest/makefile.test
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2021.
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
@@ -11,15 +11,15 @@
 
 # Run "make help" for target help.
 
-MCU          = 
-ARCH         = 
+MCU          =
+ARCH         =
 BOARD        = NONE
 F_CPU        = $(F_USB)
 OPTIMIZATION = 1
 TARGET       = Test
 SRC          = $(TARGET)_C.c $(TARGET)_CPP.cpp Dummy.S $(LUFA_SRC_USB)
 LUFA_PATH    = ../../LUFA
-DEBUG_LEVEL  = 0 
+DEBUG_LEVEL  = 0
 
 ifeq ($(ARCH), AVR8)
   F_USB        = 8000000
@@ -55,7 +55,7 @@ ifneq ($(ARCH), UC3)
   CC_FLAGS += -Wdouble-promotion
 endif
 
-# Only enable rendundant declaration warnings for AVR8 target (FIXME)
+# Only enable redundant declaration warnings for AVR8 target (FIXME)
 ifeq ($(ARCH), AVR8)
   CC_FLAGS += -Wredundant-decls
 endif
@@ -74,13 +74,21 @@ ifneq ($(ARCH), UC3)
   C_FLAGS += -Wjump-misses-init
 endif
 
+# Only check C++ compatibility on the build files, to ensure headers are C++ compatible
+Test_C.c Test_CPP.cpp: CC_FLAGS += -Wc++-compat
+
 # Potential additional warnings to enable in the future (FIXME)
-#C_FLAGS += -Wc++-compat
 #CC_FLAGS += -Wcast-qual
 #CC_FLAGS += -Wconversion
 #CC_FLAGS += -Wsign-conversion
 #CC_FLAGS += -pedantic
 
-# Include LUFA build script makefiles
-include $(LUFA_PATH)/Build/lufa_sources.mk
-include $(LUFA_PATH)/Build/lufa_build.mk
\ No newline at end of file
+# Include LUFA-specific DMBS extension modules
+DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
+include $(DMBS_LUFA_PATH)/lufa-sources.mk
+include $(DMBS_LUFA_PATH)/lufa-gcc.mk
+
+# Include common DMBS build system modules
+DMBS_PATH      ?= $(LUFA_PATH)/Build/DMBS/DMBS
+include $(DMBS_PATH)/core.mk
+include $(DMBS_PATH)/gcc.mk