From 2b332d3231d54236e093dd6bfde5421ce26f7304 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sat, 2 Jun 2012 10:46:25 +0000
Subject: Replace architecture specific makefiles in the BuildTests with the
 new common build system makefiles.

---
 LUFA/Build/lufa.build.in | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'LUFA/Build')

diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in
index 3f9d446e3..158eb24c0 100644
--- a/LUFA/Build/lufa.build.in
+++ b/LUFA/Build/lufa.build.in
@@ -81,8 +81,8 @@ endif
 BOARD         ?= NONE
 OPTIMIZATION  ?= s
 F_CPU         ?=
-C_STANDARD    ?= c99
-CPP_STANDARD  ?= c++98
+C_STANDARD    ?= gnu99
+CPP_STANDARD  ?= gnu++98
 
 # Convert input source file list to differentiate them by type
 C_SOURCE   = $(filter %.c, $(SRC))
@@ -103,10 +103,9 @@ else ifeq ($(ARCH),UC3)
  CC_FLAGS += -mpart=$(MCU) -g3 -masm-addr-pseudos
  CROSS     = avr32-
 endif
-
 CC_FLAGS += -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections
 CC_FLAGS += -Wall -Wstrict-prototypes
-CC_FLAGS += -I. -I$(LUFA_PATH)/.. -pipe
+CC_FLAGS += -I. -I$(LUFA_PATH)/..
 CC_FLAGS += -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL
 ifneq ($(F_CPU),)
    CC_FLAGS += -DF_CPU=$(F_CPU)UL
@@ -158,11 +157,11 @@ lss: $(TARGET).lss
 
 %.o: %.c
 	@echo $(MSG_COMPILE_CMD) Compiling C file \"$^\"
-	$(CROSS)gcc -c $(CC_FLAGS) -O$(OPTIMIZATION) --std=$(C_STANDARD) $< -o $@
+	$(CROSS)gcc -c $(CC_FLAGS) -O$(OPTIMIZATION) -std=$(C_STANDARD) $< -o $@
 
 %.o: %.cpp
 	@echo $(MSG_COMPILE_CMD) Compiling C++ file \"$^\"
-	$(CROSS)gcc -c $(CC_FLAGS) -O$(OPTIMIZATION) --std=$(CPP_STANDARD) -x c++ $< -o $@
+	$(CROSS)gcc -c $(CC_FLAGS) -O$(OPTIMIZATION) -std=$(CPP_STANDARD) -x c++ $< -o $@
 	
 %.o: %.S
 	@echo $(MSG_COMPILE_CMD) Assembling \"$^\"
-- 
cgit v1.2.3