Make BUILD build system module not destroy C++ source files, and support multiple...

diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in
index e9921ef..3f9d446 100644 (file)
--- a/LUFA/Build/lufa.build.in
+++ b/LUFA/Build/lufa.build.in
@@ -86,16 +86,27 @@ CPP_STANDARD  ?= c++98
 \r
 # Convert input source file list to differentiate them by type\r
 C_SOURCE   = $(filter %.c, $(SRC))\r
 \r
 # Convert input source file list to differentiate them by type\r
 C_SOURCE   = $(filter %.c, $(SRC))\r

-CPP_SOURCE = $(filter %.cpp, $(SRC)) $(filter %.c++, $(SRC))\r
+CPP_SOURCE = $(filter %.cpp, $(SRC))\r

 ASM_SOURCE = $(filter %.S, $(SRC))\r
 \r
 # Convert input source filenames into a list of required output object files\r
 ASM_SOURCE = $(filter %.S, $(SRC))\r
 \r
 # Convert input source filenames into a list of required output object files\r

-OBJECT_FILES = $(C_SOURCE:%.c=%.o) $(CPP_SOURCE:%.c++=%.o) $(CPP_SOURCE:%.c++=%.o) $(ASM_SOURCE:%.S=%.o)\r
+OBJECT_FILES = $(filter %.o, $(C_SOURCE:%.c=%.o) $(CPP_SOURCE:%.cpp=%.o) $(ASM_SOURCE:%.S=%.o))\r

 \r
 # Create a list of flags to pass to the compiler\r
 \r
 # Create a list of flags to pass to the compiler\r

-CC_FLAGS += -mmcu=$(MCU) -I. -I$(LUFA_PATH)/.. -gdwarf-2 -pipe\r
+ifeq ($(ARCH),AVR8)\r
+ CC_FLAGS += -mmcu=$(MCU) -gdwarf-2 -fshort-enums -fno-inline-small-functions -fpack-struct\r
+ CROSS     = avr-\r
+else ifeq ($(ARCH),XMEGA)\r
+ CC_FLAGS += -mmcu=$(MCU) -gdwarf-2 -fshort-enums -fno-inline-small-functions -fpack-struct\r
+ CROSS     = avr-\r
+else ifeq ($(ARCH),UC3)\r
+ CC_FLAGS += -mpart=$(MCU) -g3 -masm-addr-pseudos\r
+ CROSS     = avr32-\r
+endif\r
+\r
+CC_FLAGS += -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections\r

 CC_FLAGS += -Wall -Wstrict-prototypes\r
 CC_FLAGS += -Wall -Wstrict-prototypes\r

-CC_FLAGS += -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections -fshort-enums -fno-inline-small-functions -fpack-struct -fshort-enums\r
+CC_FLAGS += -I. -I$(LUFA_PATH)/.. -pipe\r

 CC_FLAGS += -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL\r
 ifneq ($(F_CPU),)\r
    CC_FLAGS += -DF_CPU=$(F_CPU)UL\r
 CC_FLAGS += -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL\r
 ifneq ($(F_CPU),)\r
    CC_FLAGS += -DF_CPU=$(F_CPU)UL\r


@@ -147,33 +158,32 @@ lss: $(TARGET).lss
 \r
 %.o: %.c\r
        @echo $(MSG_COMPILE_CMD) Compiling C file \"$^\"\r
 \r
 %.o: %.c\r
        @echo $(MSG_COMPILE_CMD) Compiling C file \"$^\"\r

-       avr-gcc -c $(CC_FLAGS) -O$(OPTIMIZATION) --std=$(C_STANDARD) $< -o $@\r
+       $(CROSS)gcc -c $(CC_FLAGS) -O$(OPTIMIZATION) --std=$(C_STANDARD) $< -o $@\r

 \r
 %.o: %.cpp\r
 \r
 %.o: %.cpp\r

-%.o: %.c++\r

        @echo $(MSG_COMPILE_CMD) Compiling C++ file \"$^\"\r
        @echo $(MSG_COMPILE_CMD) Compiling C++ file \"$^\"\r

-       avr-gcc -c $(CC_FLAGS) -O$(OPTIMIZATION) --std=$(CPP_STANDARD) -x c++ $< -o $@\r
+       $(CROSS)gcc -c $(CC_FLAGS) -O$(OPTIMIZATION) --std=$(CPP_STANDARD) -x c++ $< -o $@\r

        \r
 %.o: %.S\r
        @echo $(MSG_COMPILE_CMD) Assembling \"$^\"\r
        \r
 %.o: %.S\r
        @echo $(MSG_COMPILE_CMD) Assembling \"$^\"\r

-       avr-gcc -c $(CC_FLAGS) -x assembler-with-cpp $< -o $@\r
+       $(CROSS)gcc -c $(CC_FLAGS) -x assembler-with-cpp $< -o $@\r

 \r
 .PRECIOUS : $(OBJECT_FILES)\r
 %.elf: $(OBJECT_FILES)\r
        @echo $(MSG_LINKER_CMD) Linking object files into \"$@\"\r
 \r
 .PRECIOUS : $(OBJECT_FILES)\r
 %.elf: $(OBJECT_FILES)\r
        @echo $(MSG_LINKER_CMD) Linking object files into \"$@\"\r

-       avr-gcc $^ $(CC_FLAGS) $(LD_FLAGS) -o $@ \r
+       $(CROSS)gcc $^ $(CC_FLAGS) $(LD_FLAGS) -o $@\r

 \r
 %.hex: %.elf\r
        @echo $(MSG_OBJCPY_CMD) Extracting HEX file data from \"$@\"\r
 \r
 %.hex: %.elf\r
        @echo $(MSG_OBJCPY_CMD) Extracting HEX file data from \"$@\"\r

-       avr-objcopy -O ihex -R .eeprom -R .fuse -R .lock -R .signature $< $@\r
+       $(CROSS)objcopy -O ihex -R .eeprom -R .fuse -R .lock -R .signature $< $@\r

 \r
 %.eep: %.elf\r
        @echo $(MSG_OBJCPY_CMD) Extracting EEP file data from \"$@\"\r
 \r
 %.eep: %.elf\r
        @echo $(MSG_OBJCPY_CMD) Extracting EEP file data from \"$@\"\r

-       avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O ihex $< $@ || exit 0\r
+       $(CROSS)objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O ihex $< $@ || exit 0\r

 \r
 %.lss: %.elf\r
        @echo $(MSG_OBJDMP_CMD) Extracting LSS file data from \"$@\"\r
 \r
 %.lss: %.elf\r
        @echo $(MSG_OBJDMP_CMD) Extracting LSS file data from \"$@\"\r

-       avr-objdump -h -S -z $< > $@\r
+       $(CROSS)objdump -h -S -z $< > $@\r

 \r
 clean:\r
        @echo $(MSG_REMOVE_CMD) Removing object files \"$(OBJECT_FILES)\"\r
 \r
 clean:\r
        @echo $(MSG_REMOVE_CMD) Removing object files \"$(OBJECT_FILES)\"\r