fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved definition of 'PLATFORM_LINUX' macro from hwconfig to meson.build, added '-std=c++14' compilation flag to compile arguments for linux platform, added missing includes to M17Utils.h

This commit is contained in:
Silvano Seva 2021-08-23 19:18:29 +02:00
parent c8d62ff47f
commit 92ea1535ff
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -295,8 +295,9 @@ dm1801_def = def + mk22fn512_def + {'PLATFORM_DM1801': ''}
## -------------------------- Compilation arguments ---------------------------- ## -------------------------- Compilation arguments ----------------------------
## ##
linux_c_args = [] linux_c_args = ['-DPLATFORM_LINUX']
linux_l_args = ['-lm'] linux_cpp_args = ['-std=c++14', '-DPLATFORM_LINUX']
linux_l_args = ['-lm']
# Add AddressSanitizer if required # Add AddressSanitizer if required
if get_option('asan') if get_option('asan')
@ -364,6 +365,7 @@ endforeach
linux_opts = {'sources': linux_src, linux_opts = {'sources': linux_src,
'c_args': linux_c_args, 'c_args': linux_c_args,
'cpp_args' : linux_cpp_args,
'include_directories': linux_inc, 'include_directories': linux_inc,
'dependencies': linux_dep, 'dependencies': linux_dep,
'link_args' : linux_l_args} 'link_args' : linux_l_args}

2
openrtx/include/protocols/M17/M17Utils.h
View File

@ -26,6 +26,8 @@
#error This header is C++ only! #error This header is C++ only!
#endif #endif
#include <cstddef>
#include <cstdint>
#include <array> #include <array>

3
platform/targets/linux/hwconfig.h
View File

@ -15,9 +15,6 @@
* along with this program; if not, see <http://www.gnu.org/licenses/> * * along with this program; if not, see <http://www.gnu.org/licenses/> *
***************************************************************************/ ***************************************************************************/
#define PLATFORM_LINUX
/* Device has a working real time clock */ /* Device has a working real time clock */
#define HAS_RTC #define HAS_RTC