Update Studio Integration DLL, to include package logging.

[pub/USBasp.git] / BuildTests / ModuleTest / makefile.test

diff --git a/BuildTests/ModuleTest/makefile.test b/BuildTests/ModuleTest/makefile.test
index 55f3941..6225ec0 100644 (file)
--- a/BuildTests/ModuleTest/makefile.test
+++ b/BuildTests/ModuleTest/makefile.test
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
 #
 #             LUFA Library

-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2015.

 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org


@@ -11,15 +11,15 @@
 
 # Run "make help" for target help.
 
 
 # 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
 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
 
 ifeq ($(ARCH), AVR8)
   F_USB        = 8000000


@@ -55,7 +55,7 @@ ifneq ($(ARCH), UC3)
   CC_FLAGS += -Wdouble-promotion
 endif
 
   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
 ifeq ($(ARCH), AVR8)
   CC_FLAGS += -Wredundant-decls
 endif


@@ -74,8 +74,10 @@ ifneq ($(ARCH), UC3)
   C_FLAGS += -Wjump-misses-init
 endif
 
   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.c: CC_FLAGS += -Wc++-compat
+

 # Potential additional warnings to enable in the future (FIXME)
 # 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 += -Wcast-qual
 #CC_FLAGS += -Wconversion
 #CC_FLAGS += -Wsign-conversion


@@ -83,4 +85,4 @@ endif
 
 # Include LUFA build script makefiles
 include $(LUFA_PATH)/Build/lufa_sources.mk
 
 # 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_PATH)/Build/lufa_build.mk