From f616011ac1bf1ae969f1cacc14177369d7ea5753 Mon Sep 17 00:00:00 2001 From: Joe Finney Date: Wed, 2 Sep 2015 18:54:31 +0100 Subject: [PATCH] microbit: Integrate support for transparent gcc compiles Custom CMakefile added to microbit-dal to automatically assemble the correct version of CortexContextSwitch.s accordiong to the current build target. --- source/CMakeLists.txt | 4 ++++ source/{CortexContextSwitch.s => CortexContextSwitch.s.armcc} | 0 2 files changed, 4 insertions(+) rename source/{CortexContextSwitch.s => CortexContextSwitch.s.armcc} (100%) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 617e3de..39af54f 100755 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -27,11 +27,15 @@ set(YOTTA_AUTO_MICROBIT-DAL_CPP_FILES "DynamicPwm.cpp" "MicroBitPin.cpp" "MicroBitSerial.cpp" + "MicroBitHeapAllocator.cpp" ) if(CMAKE_COMPILER_IS_GNUCC) file(REMOVE "CortexContextSwitch.s") configure_file("CortexContextSwitch.s.gcc" "CortexContextSwitch.s" COPYONLY) +else() + file(REMOVE "CortexContextSwitch.s") + configure_file("CortexContextSwitch.s.armcc" "CortexContextSwitch.s" COPYONLY) endif() set(YOTTA_AUTO_MICROBIT-DAL_S_FILES diff --git a/source/CortexContextSwitch.s b/source/CortexContextSwitch.s.armcc similarity index 100% rename from source/CortexContextSwitch.s rename to source/CortexContextSwitch.s.armcc