From 322ea583de9dac8871c6e40c330cf4441535e3e9 Mon Sep 17 00:00:00 2001 From: Florian Fleissner Date: Thu, 16 Jan 2020 16:11:25 +0100 Subject: [PATCH] Moved gcc extra flags from kaleidoscope-builder to platform.txt Signed-off-by: Florian Fleissner --- avr/libraries/Model01-Firmware | 2 +- avr/platform.txt | 4 ++-- virtual/platform.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/avr/libraries/Model01-Firmware b/avr/libraries/Model01-Firmware index 2f9d140..03bee4b 160000 --- a/avr/libraries/Model01-Firmware +++ b/avr/libraries/Model01-Firmware @@ -1 +1 @@ -Subproject commit 2f9d140ba94d6c5934ad17eed98654211706c7a7 +Subproject commit 03bee4b8746aa79a0f1dcf5e5c0c2a1742b8162d diff --git a/avr/platform.txt b/avr/platform.txt index 2b26493..83643d8 100644 --- a/avr/platform.txt +++ b/avr/platform.txt @@ -27,7 +27,7 @@ compiler.c.elf.flags_join_archives=rcT compiler.c.elf.cmd=avr-gcc compiler.S.flags=-c -g -x assembler-with-cpp compiler.cpp.cmd=avr-g++ -compiler.cpp.flags=-c -g -Os {compiler.warning_flags} -std=gnu++11 -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD +compiler.cpp.flags=-c -g -Os {compiler.warning_flags} -std=c++14 -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD -Woverloaded-virtual -Wno-unused-parameter -Wno-unused-variable -Wno-ignored-qualifiers compiler.ar.cmd=avr-ar compiler.ar.flags=rcs compiler.objcopy.cmd=avr-objcopy @@ -44,7 +44,7 @@ build.extra_flags= compiler.c.extra_flags= compiler.c.elf.extra_flags= compiler.S.extra_flags= -compiler.cpp.extra_flags=-Woverloaded-virtual -Wno-unused-parameter -Wno-unused-variable -Wno-ignored-qualifiers +compiler.cpp.extra_flags= compiler.ar.extra_flags= compiler.objcopy.eep.extra_flags= compiler.elf2hex.extra_flags= diff --git a/virtual/platform.txt b/virtual/platform.txt index f156b56..04f6dce 100644 --- a/virtual/platform.txt +++ b/virtual/platform.txt @@ -22,7 +22,7 @@ compiler.c.elf.flags_join_archives=rcT compiler.c.elf.cmd=g++ compiler.S.flags=-c -g -x assembler-with-cpp compiler.cpp.cmd=g++ -compiler.cpp.flags=-c -g {compiler.warning_flags} -std=gnu++11 -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD -DKALEIDOSCOPE_VIRTUAL_BUILD=1 -DKEYBOARDIOHID_BUILD_WITHOUT_HID=1 -DUSBCON=dummy -DARDUINO_ARCH_AVR=1 +compiler.cpp.flags=-c -g {compiler.warning_flags} -std=c++14 -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD -Woverloaded-virtual -Wno-unused-parameter -Wno-unused-variable -Wno-ignored-qualifiers -DKALEIDOSCOPE_VIRTUAL_BUILD=1 -DKEYBOARDIOHID_BUILD_WITHOUT_HID=1 -DUSBCON=dummy -DARDUINO_ARCH_AVR=1 compiler.ar.cmd=ar compiler.ar.flags=rcs compiler.objcopy.cmd=objcopy