From 28dc16133762b7de4d1a82fb5c10fd639862126b Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Thu, 16 Sep 2021 11:23:55 +0200 Subject: [PATCH] PoC: compile companion macOS without arm-gcc toolchain --- .github/workflows/macosx_cpn.yml | 5 ----- radio/src/CMakeLists.txt | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml index d8307c14b..e18263897 100644 --- a/.github/workflows/macosx_cpn.yml +++ b/.github/workflows/macosx_cpn.yml @@ -50,11 +50,6 @@ jobs: - name: Install dependencies run: python -m pip install --upgrade pip Pillow - - name: Install ARM toolchain - uses: fiam/arm-none-eabi-gcc@v1 - with: - release: '10-2020-q4' - - name: Install dfu-util run: wget https://downloads.sourceforge.net/project/dfu-util/dfu-util-0.9.tar.gz && tar xfv dfu-util-0.9.tar.gz && diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 387dd3706..0d72f1aeb 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -108,6 +108,7 @@ endif() add_subdirectory(translations) add_subdirectory(bitmaps) add_subdirectory(fonts) +add_subdirectory(lua) if(NOT PCB STREQUAL 9XRPRO) option(DBLKEYS "Double Keys" ON) @@ -678,8 +679,3 @@ if(NOT MSVC) PrintTargetReport("firmware") endif(NOT MSVC) - -# Include the lua subdirectory after CMAKE_C_COMPILER has been -# set. Otherwise, the custom commands it includes will use the -# default CMAKE_C_COMPILER instead of the one we set manually -add_subdirectory(lua)