PoC: compile companion macOS without arm-gcc toolchain
This commit is contained in:
@@ -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 &&
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user