diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt index efc11bcbae1857a81ea33a6da1634a5f113cbeb7..6ec1239a74187c22f84e820816d50a8ce28b111b 100644 --- a/cmake_targets/CMakeLists.txt +++ b/cmake_targets/CMakeLists.txt @@ -183,7 +183,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,${CMAKE_CU ######################### # set a flag for changes in the source code # these changes are related to hardcoded path to include .h files -add_definitions(-DCMAKER) set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3 -O2") diff --git a/cmake_targets/at_commands/CMakeLists.txt b/cmake_targets/at_commands/CMakeLists.txt index 54f369f97772e7bdbf8214b191afdfb89e7cfce4..bd71125cf0ac1d920b742f12dccb8b04ffbc671f 100755 --- a/cmake_targets/at_commands/CMakeLists.txt +++ b/cmake_targets/at_commands/CMakeLists.txt @@ -76,7 +76,6 @@ macro(add_boolean_option name val helpstr) endmacro(add_boolean_option) # compilation flags -# added CMAKER conditional compilation to not bother legacy building system ############################################# if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) @@ -84,7 +83,7 @@ endif() set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel) # -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -DCMAKER") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat ") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -DMALLOC_CHECK_=3") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb -DMALLOC_CHECK_=3 -O2") diff --git a/common/utils/assertions.h b/common/utils/assertions.h index b872b009e258408e799f6dfaaf0cc2697c1913f4..77e939affe4b7393aadb286b86c8b8551cc5d25f 100644 --- a/common/utils/assertions.h +++ b/common/utils/assertions.h @@ -22,9 +22,7 @@ #include <stdio.h> #include <stdlib.h> #include <inttypes.h> -#ifdef CMAKER #include <platform_types.h> -#endif #if defined(ENB_MODE) # define display_backtrace() diff --git a/openair2/COMMON/platform_constants.h b/openair2/COMMON/platform_constants.h index b00e08588af444c807fd0edb346634f6e9209984..6a3b7f80050d8d173f63087c73c8bd8186a3db55 100644 --- a/openair2/COMMON/platform_constants.h +++ b/openair2/COMMON/platform_constants.h @@ -28,11 +28,7 @@ ***************************************************************************/ -#ifdef CMAKER #include "LTE_asn_constant.h" -#else -#include "RRC/LTE/MESSAGES/asn1_constants.h" -#endif #ifndef __PLATFORM_CONSTANTS_H__ # define __PLATFORM_CONSTANTS_H__ diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h index c1b554c216d255bd9429ad6db2366cfd17669a27..9a47580dbc785b0fae1009785bc63a3f0e59e2bf 100644 --- a/openair2/COMMON/rrc_messages_types.h +++ b/openair2/COMMON/rrc_messages_types.h @@ -32,11 +32,7 @@ #include "as_message.h" #include "rrc_types.h" #include "s1ap_messages_types.h" -#ifdef CMAKER #include "LTE_SystemInformationBlockType2.h" -#else - #include "RRC/LTE/MESSAGES/LTE_SystemInformationBlockType2.h" -#endif #include "LTE_SL-OffsetIndicator-r12.h" #include "LTE_SubframeBitmapSL-r12.h" #include "LTE_SL-CP-Len-r12.h" diff --git a/openair2/ENB_APP/enb_config.h b/openair2/ENB_APP/enb_config.h index 1b47a112cf5556a62f28c0927c94c21365801916..f5cf3018288485afffd0c5118b00e0c2b24917bb 100644 --- a/openair2/ENB_APP/enb_config.h +++ b/openair2/ENB_APP/enb_config.h @@ -40,12 +40,8 @@ #include "PHY/impl_defs_lte.h" #include "PHY/defs_eNB.h" #include "s1ap_messages_types.h" -#ifdef CMAKER #include "LTE_SystemInformationBlockType2.h" #include "rrc_messages_types.h" -#else -#include "RRC/LTE/MESSAGES/LTE_SystemInformationBlockType2.h" -#endif #include "RRC/LTE/rrc_defs.h" #include <intertask_interface.h> diff --git a/openair3/TEST/EPC_TEST/generate_scenario.h b/openair3/TEST/EPC_TEST/generate_scenario.h index 0f240f483d293b13a09ea48e87d74631d729c3e2..b2042a894cd54b7e96ce4169373429896e538d76 100644 --- a/openair3/TEST/EPC_TEST/generate_scenario.h +++ b/openair3/TEST/EPC_TEST/generate_scenario.h @@ -38,11 +38,7 @@ #include "platform_constants.h" #include "PHY/impl_defs_lte.h" #include "s1ap_messages_types.h" -#ifdef CMAKER #include "SystemInformationBlockType2.h" -#else -#include "RRC/LTE/MESSAGES/SystemInformationBlockType2.h" -#endif #define IPV4_STR_ADDR_TO_INT_NWBO(AdDr_StR,NwBo,MeSsAgE ) do {\ struct in_addr inp;\