From fdeb15253db1352c7dc7fdbb5f84eb1d29eedeea Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sat, 8 Nov 2014 10:16:58 +0100 Subject: [PATCH] This enables build of Companion on OS X Remove the check for arm-gcc version when doing Companion build --- companion/src/CMakeLists.txt | 2 +- radio/src/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index b3c4398f2..ab11fd94b 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -89,7 +89,7 @@ add_custom_command( add_custom_command( OUTPUT ${RADIO_SRC_DIRECTORY}/lua_exports.inc - COMMAND make lua_exports.cpp + COMMAND make PCB=TARANIS lua_exports.cpp DEPENDS ${RADIO_SRC_DIRECTORY}/myeeprom.h WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} ) diff --git a/radio/src/Makefile b/radio/src/Makefile index 348108b09..27c3d5550 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -1318,7 +1318,7 @@ bitmaps/sticks.lbm: bitmaps/sticks_4x1.xbm bitmaps/splash_9x.xbm bitmaps/splash_ lua_exports.cpp: myeeprom.h ../util/luaexport.py @echo "Generating a list of Lua exported constants in lua_exports.txt" - @$(CPP) -DPCBTARANIS -DCPUARM -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt + @gcc -E -x c++ -DPCBTARANIS -DCPUARM -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt @echo "Parsing and generating C Lua exports in lua_exports.cpp" @python ../util/luaexport.py $(VERSION) lua_exports.txt lua_exports.cpp lua_fields.txt @rm lua_exports.txt