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

replace/726b921821d30dba90c55bbe657f7c6238787bd9
Silvano Seva 2021-08-23 19:18:29 +02:00
rodzic c8d62ff47f
commit 92ea1535ff
3 zmienionych plików z 6 dodań i 5 usunięć

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

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