[GITLAB] - UPGRADE TO v12 on Wednesday the 18th of December at 11.30AM

Commit fd66c409 authored by Florian Kaltenberger's avatar Florian Kaltenberger

changes in old Makefiles to compile oaisim and dot11sim


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7190 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 8297a752
...@@ -43,6 +43,7 @@ ITTI_OBJS += $(ITTI_DIR)/timer.o ...@@ -43,6 +43,7 @@ ITTI_OBJS += $(ITTI_DIR)/timer.o
HASHTABLE_DIR = $(COMMON_UTILS_DIR)/collection/hashtable HASHTABLE_DIR = $(COMMON_UTILS_DIR)/collection/hashtable
MSC_DIR = $(COMMON_UTILS_DIR)/msc
HASHTABLE_OBJS = $(HASHTABLE_DIR)/hashtable.o HASHTABLE_OBJS = $(HASHTABLE_DIR)/hashtable.o
HASHTABLE_OBJS += $(HASHTABLE_DIR)/obj_hashtable.o HASHTABLE_OBJS += $(HASHTABLE_DIR)/obj_hashtable.o
...@@ -52,6 +53,7 @@ UTILS_OBJS = $(ITTI_OBJS) $(HASHTABLE_OBJS) ...@@ -52,6 +53,7 @@ UTILS_OBJS = $(ITTI_OBJS) $(HASHTABLE_OBJS)
UTILS_incl = \ UTILS_incl = \
-I$(COMMON_UTILS_DIR) \ -I$(COMMON_UTILS_DIR) \
-I$(HASHTABLE_DIR) \ -I$(HASHTABLE_DIR) \
-I$(ITTI_DIR) -I$(ITTI_DIR) \
-I$(MSC_DIR)
print-% : ; @echo $* = $($*) print-% : ; @echo $* = $($*)
...@@ -6,7 +6,7 @@ export OPENAIR2_DIR=$OPENAIR_HOME/openair2 ...@@ -6,7 +6,7 @@ export OPENAIR2_DIR=$OPENAIR_HOME/openair2
export OPENAIR3_DIR=$OPENAIR_HOME/openair3 export OPENAIR3_DIR=$OPENAIR_HOME/openair3
export OPENAIRCN_DIR=$OPENAIR_HOME/openair-cn export OPENAIRCN_DIR=$OPENAIR_HOME/openair-cn
export OPENAIR_TARGETS=$OPENAIR_HOME/targets export OPENAIR_TARGETS=$OPENAIR_HOME/targets
export OPENAIRCN_DIR=$OPENAIR_HOME/openair-cn export OPENAIRITS_DIR=$OPENAIR_HOME/openairITS
alias oai='cd $OPENAIR_HOME' alias oai='cd $OPENAIR_HOME'
alias oai0='cd $OPENAIR0_DIR' alias oai0='cd $OPENAIR0_DIR'
......
...@@ -41,6 +41,7 @@ RTIME dd_t1=0,dd_t2=0,dd_t3=0,dd_t4=0; ...@@ -41,6 +41,7 @@ RTIME dd_t1=0,dd_t2=0,dd_t3=0,dd_t4=0;
#else #else
long dd_t1=0,dd_t2=0,dd_t3=0,dd_t4=0; long dd_t1=0,dd_t2=0,dd_t3=0,dd_t4=0;
#endif #endif
#endif
int dd_trials=0; int dd_trials=0;
#ifdef RTAI #ifdef RTAI
...@@ -59,6 +60,7 @@ int16_t Pseq_rx[127] = { 1, 1, 1, 1,-1,-1,-1, 1,-1,-1,-1,-1, 1, 1,-1, 1, ...@@ -59,6 +60,7 @@ int16_t Pseq_rx[127] = { 1, 1, 1, 1,-1,-1,-1, 1,-1,-1,-1,-1, 1, 1,-1, 1,
int32_t rxDATA_F_comp_aggreg2[48*1024]; int32_t rxDATA_F_comp_aggreg2[48*1024];
int32_t rxDATA_F_comp_aggreg3[48*1024]; int32_t rxDATA_F_comp_aggreg3[48*1024];
#ifdef EXECTIME
void print_dd_stats() { void print_dd_stats() {
if (dd_trials>0) if (dd_trials>0)
......
export TOP_DIR = $(OPENAIR1_DIR)
export OPENAIR2_TOP = $(OPENAIR2_DIR)
export COMMON_UTILS_DIR = $(OPENAIR_HOME)/common/utils
include $(OPENAIR_HOME)/common/utils/Makefile.inc include $(OPENAIR_HOME)/common/utils/Makefile.inc
include $(OPENAIR1_DIR)/SIMULATION/Makefile.inc
include $(OPENAIR2_DIR)/UTIL/Makefile.inc
include $(OPENAIRITS_DIR)/phy/DOT11/Makefile.inc
CFLAGS += -DMALLOC_CHECK_=1 -DEXECTIME
CFLAGS += -DEXECTIME -DMALLOC_CHECK_=1 CFLAGS += -DUSER_MODE -DNB_ANTENNAS_TX=1 -DNB_ANTENNAS_RX=2
CFLAGS += -I$(OPENAIR1_DIR) -DNO_OPENAIR1 -DUSER_MODE -I$(OPENAIRITS_DIR) -I$(OPENAIR2_DIR) -DNB_ANTENNAS_TX=1 -DNB_ANTENNAS_RX=2 CFLAGS += $(UTILS_incl) -I$(OPENAIR1_DIR) -I$(OPENAIRITS_DIR) -I$(OPENAIR2_DIR) -I$(OPENAIR2_DIR)/COMMON
LFLAGS = -lm -lblas -lxml2 -lrt LFLAGS = -lm -lblas -lxml2 -lrt
...@@ -20,21 +29,10 @@ CFLAGS += -DPERFECT_CE ...@@ -20,21 +29,10 @@ CFLAGS += -DPERFECT_CE
endif endif
CFLAGS += -I/usr/include/X11 -I/usr/X11R6/include CFLAGS += -I/usr/include/X11 -I/usr/X11R6/include
TOP_DIR=$(OPENAIR1_DIR)
LOG_DIR=$(OPENAIR2_DIR)/UTIL/LOG
export TOP_DIR
export OPENAIR1_DIR
export OPENAIR2_TOP = $(OPENAIR2_DIR)
export OPENAIRITS_DIR
include $(OPENAIR1_DIR)/SIMULATION/Makefile.inc
include $(OPENAIRITS_DIR)/phy/DOT11/Makefile.inc
include $(OPENAIR2_DIR)/UTIL/Makefile.inc
#TOOLS_OBJS += $(OPENAIR1_DIR)/PHY/TOOLS/file_output.o #TOOLS_OBJS += $(OPENAIR1_DIR)/PHY/TOOLS/file_output.o
OBJ = $(PHY_OBJS) $(SIMULATION_OBJS) $(TOOLS_OBJS) $(LOG_OBJS) OBJ = $(PHY_OBJS) $(SIMULATION_OBJS) $(TOOLS_OBJS) $(LOG_OBJS) $(ITTI_DIR)/backtrace.o
ifdef XFORMS ifdef XFORMS
OBJ += dot11_scope.o OBJ += dot11_scope.o
......
...@@ -23,6 +23,8 @@ uint16_t rev64[64]; ...@@ -23,6 +23,8 @@ uint16_t rev64[64];
#define RX_THRES_dB 26 #define RX_THRES_dB 26
int opp_enabled=1;
int main(int argc, char **argv) { int main(int argc, char **argv) {
char c; char c;
......
...@@ -472,6 +472,7 @@ print: ...@@ -472,6 +472,7 @@ print:
showcflags: showcflags:
@echo oaisim cflags: $(CFLAGS) @echo oaisim cflags: $(CFLAGS)
@echo oaisim includes: $(INCLUDES)
@if [ -d $(S1AP_DIR) ]; then $(MAKE) -C $(S1AP_DIR) -f Makefile.eNB showcflags; fi @if [ -d $(S1AP_DIR) ]; then $(MAKE) -C $(S1AP_DIR) -f Makefile.eNB showcflags; fi
@if [ -d $(X2AP_DIR) ]; then $(MAKE) -C $(X2AP_DIR) -f Makefile.inc showcflags; fi @if [ -d $(X2AP_DIR) ]; then $(MAKE) -C $(X2AP_DIR) -f Makefile.inc showcflags; fi
......
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