Commit e6ce6fea authored by thomasl's avatar thomasl

added conditional compilation for new cmake based build

in this version, the asn.1 generated files are in directory that depend on 3GGP version instead of the (complex) .lock files management



git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6644 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 94699d4d
...@@ -36,7 +36,11 @@ ...@@ -36,7 +36,11 @@
***************************************************************************/ ***************************************************************************/
#ifdef CMAKER
#include "asn1_constants.h"
#else
#include "RRC/LITE/MESSAGES/asn1_constants.h" #include "RRC/LITE/MESSAGES/asn1_constants.h"
#endif
#ifndef __PLATFORM_CONSTANTS_H__ #ifndef __PLATFORM_CONSTANTS_H__
# define __PLATFORM_CONSTANTS_H__ # define __PLATFORM_CONSTANTS_H__
......
...@@ -40,7 +40,11 @@ ...@@ -40,7 +40,11 @@
#include "as_message.h" #include "as_message.h"
#include "rrc_types.h" #include "rrc_types.h"
#include "s1ap_messages_types.h" #include "s1ap_messages_types.h"
#ifdef CMAKER
#include "SystemInformationBlockType2.h"
#else
#include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h" #include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h"
#endif
//-------------------------------------------------------------------------------------------// //-------------------------------------------------------------------------------------------//
// Messages for RRC logging // Messages for RRC logging
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
# include "sctp_eNB_task.h" # include "sctp_eNB_task.h"
# endif # endif
#endif #endif
#include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h"
#include "LAYER2/MAC/extern.h" #include "LAYER2/MAC/extern.h"
#define ENB_CONFIG_STRING_ACTIVE_ENBS "Active_eNBs" #define ENB_CONFIG_STRING_ACTIVE_ENBS "Active_eNBs"
......
...@@ -46,7 +46,11 @@ ...@@ -46,7 +46,11 @@
#include "platform_constants.h" #include "platform_constants.h"
#include "PHY/impl_defs_lte.h" #include "PHY/impl_defs_lte.h"
#include "s1ap_messages_types.h" #include "s1ap_messages_types.h"
#ifdef CMAKER
#include "SystemInformationBlockType2.h"
#else
#include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h" #include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h"
#endif
// Hard to find a defined value for max enb... // Hard to find a defined value for max enb...
#define MAX_ENB 16 #define MAX_ENB 16
......
...@@ -55,6 +55,9 @@ ...@@ -55,6 +55,9 @@
#include "rtai_fifos.h" #include "rtai_fifos.h"
#endif #endif
#ifdef CMAKER
#include <ConfigOAI.h>
#endif
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#ifdef __cplusplus #ifdef __cplusplus
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment