From eab639362a8283cd326e170786d715a2dd314a28 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Tue, 5 Apr 2016 19:12:07 +0200 Subject: [PATCH] Compilation fix --- radio/src/CMakeLists.txt | 9 +++++---- radio/src/audio_arm.cpp | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index bad23ac22..dc472f44b 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -979,14 +979,15 @@ if(ARCH STREQUAL ARM) set(CMAKE_ASM_COMPILE_OBJECT " -o ") set(COMMON_FLAGS "-mcpu=${MCU} -mthumb -fomit-frame-pointer -fverbose-asm -Wa,-ahlms=firmware.lst -O${OPT} -gdwarf-2 -DHSE_VALUE=${HSE_VALUE} -fno-exceptions -fdata-sections -ffunction-sections ${WARNING_FLAGS}") + set(COMMON_CPP_FLAGS "${COMMON_FLAGS} -std=gnu++11") set(CMAKE_C_FLAGS "${COMMON_FLAGS} -Wimplicit") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${COMMON_FLAGS} -Wimplicit -g") set(CMAKE_C_FLAGS_RELEASE "${COMMON_FLAGS} -Wimplicit") set(CMAKE_C_FLAGS_DEBUG "${COMMON_FLAGS} -Wimplicit -g") - set(CMAKE_CXX_FLAGS "${COMMON_FLAGS}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${COMMON_FLAGS} -g") - set(CMAKE_CXX_FLAGS_RELEASE "${COMMON_FLAGS}") - set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_FLAGS} -g") + set(CMAKE_CXX_FLAGS "${COMMON_CPP_FLAGS}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${COMMON_CPP_FLAGS} -g") + set(CMAKE_CXX_FLAGS_RELEASE "${COMMON_CPP_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CPP_FLAGS} -g") set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -lm -T${RADIO_SRC_DIRECTORY}/${LINKER_SCRIPT} -Wl,-Map=firmware.map,--cref,--no-warn-mismatch,--gc-sections") if(PCB STREQUAL TARANIS) diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp index 3d6369dd1..c9ebe286c 100644 --- a/radio/src/audio_arm.cpp +++ b/radio/src/audio_arm.cpp @@ -20,7 +20,8 @@ #include "opentx.h" #include - +#include + extern OS_MutexID audioMutex; const int16_t sineValues[] =