Merge branch 'develop' into develop-SA-CBRA

# Conflicts: # cmake_targets/CMakeLists.txt # openair1/SIMULATION/NR_PHY/dlsim.c # openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:29:53 +00:00
parent 31cf9ab847 0114160246
commit 48811d0f34
72 changed files with 10464 additions and 488 deletions
@@ -43,7 +43,7 @@
 #include "config_userapi.h"
 #include "../utils/LOG/log.h"
 #define CONFIG_SHAREDLIBFORMAT "libparams_%s.so"
-
+#include "nfapi/oai_integration/vendor_ext.h"

 int load_config_sharedlib(configmodule_interface_t *cfgptr) {
  void *lib_handle;