diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 033e096f4..0cfc9a00d 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -95,6 +95,7 @@ ADD_CUSTOM_COMMAND( IF( MSVC ) SET(CMAKE_CXX_FLAGS "/EHsc /LD") + set(INTTYPES_INCLUDE_OPTION -IC:/Programs/msinttypes) INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes) LINK_DIRECTORIES( C:/Programs/pthreads/Pre-built.2/lib/ ) SET( PTHREAD_LIBRARY pthreadVC2.lib ) diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt index 579accf52..cedd22808 100644 --- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt +++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt @@ -77,7 +77,7 @@ macro(add_lua_export_target target) string(TOUPPER ${target} pcbdefine) add_custom_command( OUTPUT ${RADIO_SRC_DIRECTORY}/lua/lua_exports_${target}.inc - COMMAND ${CMAKE_C_COMPILER} -E -DPCB${pcbdefine} -DCPUARM -DCPUSTM32 -DLUA -DEXPORT myeeprom.h | grep LEXP > lua/lua_exports_${target}.txt + COMMAND ${CMAKE_C_COMPILER} -E -DPCB${pcbdefine} -DCPUARM -DCPUSTM32 -DLUA -DEXPORT ${INTTYPES_INCLUDE_OPTION} myeeprom.h | grep LEXP > lua/lua_exports_${target}.txt COMMAND python ../util/luaexport.py ${VERSION} lua/lua_exports_${target}.txt lua/lua_exports_${target}.inc lua/lua_fields_${target}.txt WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} )