commit before merge with develop

cmake_targets/CMakeLists.txt

@@ -2206,7 +2206,7 @@ target_link_libraries (dlsim_tm4
   pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB}
   )
 
-foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
+foreach(myExe dlsim dlsim_tm7 ulsim slschsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
 
   add_executable(${myExe}
     ${OPENAIR_BIN_DIR}/messages_xml.h

cmake_targets/build_oai

@@ -627,7 +627,7 @@ function main() {
   if [ "$SIMUS_PHY" = "1" ] ; then
     # lte unitary simulators compilation
     echo_info "Compiling unitary tests simulators"
-    simlist="dlsim_tm4 dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim"
+    simlist="dlsim_tm4 dlsim ulsim slschsim pucchsim prachsim pdcchsim pbchsim mbmssim"
     for f in $simlist ; do
       compilations \
       lte-simulators $f \

cmake_targets/lte-simulators/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
 set(PACKAGE_NAME "unitary_tests_simulators")
 set(PHYSIM True)
+set(RRC_ASN1_VERSION "Rel14")
 set(RF_BOARD None)
 set(XFORMS True)
 set(ENABLE_ITTI False)

openair1/PHY/vars.h

@@ -24,6 +24,7 @@
 
 #include "PHY/types.h"
 #include "PHY/defs.h"
+#include "common/ran_context.h"
 
 char* namepointer_chMag ;
 char fmageren_name2[512];