diff --git a/acados/utils/math.c b/acados/utils/math.c index 57ede7c331..915c41f1e0 100644 --- a/acados/utils/math.c +++ b/acados/utils/math.c @@ -40,7 +40,7 @@ #include "acados/utils/math.h" #include "acados/utils/types.h" -#if defined(__DSPACE__) +#if defined(__MABX2__) double fmax(double a, double b) { return a > b ? a : b; diff --git a/acados/utils/math.h b/acados/utils/math.h index ac0d3263e8..fe1da875f6 100644 --- a/acados/utils/math.h +++ b/acados/utils/math.h @@ -40,7 +40,7 @@ extern "C" { #include "acados/utils/types.h" -#if defined(__DSPACE__) +#if defined(__MABX2__) double fmax(double a, double b); #endif diff --git a/acados/utils/print.c b/acados/utils/print.c index bc2d5983c7..d36e2ff52b 100644 --- a/acados/utils/print.c +++ b/acados/utils/print.c @@ -34,7 +34,7 @@ // external #include -#if defined(__DSPACE__) +#if defined(__MABX2__) #include #define printf(...) \ msg_info_printf(MSG_SM_USER, 0, __VA_ARGS__); \ diff --git a/acados/utils/timing.c b/acados/utils/timing.c index 85d697586a..0cb878b3d0 100644 --- a/acados/utils/timing.c +++ b/acados/utils/timing.c @@ -72,7 +72,7 @@ real_t acados_toc(acados_timer* t) return (real_t) duration / 1e9; } -#elif defined(__DSPACE__) +#elif defined(__MABX2__) void acados_tic(acados_timer* t) { diff --git a/acados/utils/timing.h b/acados/utils/timing.h index 823b763f66..fe561d3891 100644 --- a/acados/utils/timing.h +++ b/acados/utils/timing.h @@ -67,7 +67,7 @@ typedef struct acados_timer_ mach_timebase_info_data_t tinfo; } acados_timer; -#elif defined(__DSPACE__) +#elif defined(__MABX2__) #include diff --git a/cmake/Platform/dSpaceDS1401.cmake b/cmake/Platform/dSpaceDS1401.cmake index 1ba2308b2a..1d7c8c0590 100644 --- a/cmake/Platform/dSpaceDS1401.cmake +++ b/cmake/Platform/dSpaceDS1401.cmake @@ -51,6 +51,6 @@ set(CMAKE_C_FLAGS "\"-J${DSPACE_RTLIB}\"") set(CMAKE_INCLUDE_FLAG_C "-J") set(CMAKE_INCLUDE_FLAG_CXX "-J") -add_definitions(-D__DSPACE__) +add_definitions(-D__MABX2__) remove_definitions(-DLINUX) remove_definitions(-D__LINUX__) diff --git a/cmake/Toolchain-dSpaceDS1401.cmake b/cmake/Toolchain-dSpaceDS1401.cmake index 9d03df8df3..3471039aee 100644 --- a/cmake/Toolchain-dSpaceDS1401.cmake +++ b/cmake/Toolchain-dSpaceDS1401.cmake @@ -24,6 +24,8 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +add_definitions(-D__MABX2__) + # Compiler flags set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -H -J{DSPACE_RTLIB}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -H -J{DSPACE_RTLIB}")