merge Makefile
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#ifndef _AV_INTERFACE_H
|
||||
#define _AV_INTERFACE_H
|
||||
|
||||
#define K_PROJECT 0 //<2F>Ƿ<EFBFBD><C7B7><EFBFBD>K<EFBFBD><4B>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD>Ҫ<EFBFBD>ǽ<EFBFBD><C7BD><EFBFBD><EFBFBD>Ľӿڲ<D3BF>һ<EFBFBD><D2BB>
|
||||
#define K_PROJECT 1 //<2F>Ƿ<EFBFBD><C7B7><EFBFBD>K<EFBFBD><4B>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD>Ҫ<EFBFBD>ǽ<EFBFBD><C7BD><EFBFBD><EFBFBD>Ľӿڲ<D3BF>һ<EFBFBD><D2BB>
|
||||
|
||||
#define PROTO_VERSION 3
|
||||
#define PROTO_MAGICNUM 0x5641
|
||||
|
||||
15
src/Makefile
15
src/Makefile
@@ -7,9 +7,19 @@ PAPP_PATH=/home/mesasoft/frag_rssb/
|
||||
#CFLAGS = -g3 -Wall -fPIC -O
|
||||
INCLUDES = -I./inc/
|
||||
INCLUDES += -I/usr/include/MESA/
|
||||
INCLUDES += -I./support/hiredis-vip-master/
|
||||
INCLUDES += -I./support/hiredisv4/
|
||||
CFLAGS = -g3 -Wall -fPIC -D__STDC_FORMAT_MACROS
|
||||
CFLAGS += $(INCLUDES)
|
||||
|
||||
ifeq ($(MODE), PIC)
|
||||
CFLAGS += -DPIC_FUNC=1
|
||||
TARGET = pic_rssb_maskey
|
||||
else ifeq ($(MODE), VOIP)
|
||||
CFLAGS += -DPIC_FUNC=1
|
||||
TARGET = voip_rssb_maskey
|
||||
else
|
||||
TARGET = av_rssb_maskey
|
||||
endif
|
||||
#LDDICTATOR = -Wl,-wrap,malloc -Wl,-wrap,calloc -Wl,-wrap,free -Wl,-wrap,realloc
|
||||
LDDICTATOR =
|
||||
CC = g++
|
||||
@@ -34,9 +44,6 @@ OBJECTS = $(SOURCES:.c=.o)
|
||||
OBJECTSCPP = $(SOURCESCPP:.cpp=.o)
|
||||
#DEPS = $(SOURCES:.c=.d)
|
||||
|
||||
|
||||
TARGET = rssb_maskey
|
||||
|
||||
.PHONY:clean all
|
||||
|
||||
all:$(TARGET)
|
||||
|
||||
11
src/main.c
11
src/main.c
@@ -1076,10 +1076,15 @@ int main(int argc, char **argv)
|
||||
wired_cfg_init(main_conf_handle);
|
||||
rssb_conf_handle=wired_cfg_create("VOIP_RSSB_CONF", "./conf/frag_reassembly.conf");
|
||||
wired_cfg_init(rssb_conf_handle);
|
||||
#else
|
||||
main_conf_handle=wired_cfg_create("RSSB_MAIN_CONF", "./conf/main.conf");
|
||||
#elif PIC_FUNC
|
||||
main_conf_handle=wired_cfg_create("PIC_RSSB_MAIN_CONF", "./conf/main.conf");
|
||||
wired_cfg_init(main_conf_handle);
|
||||
rssb_conf_handle=wired_cfg_create("RSSB_CONF", "./conf/frag_reassembly.conf");
|
||||
rssb_conf_handle=wired_cfg_create("PIC_RSSB_REASSEMBLY_CONF", "./conf/frag_reassembly.conf");
|
||||
wired_cfg_init(rssb_conf_handle);
|
||||
#else
|
||||
main_conf_handle=wired_cfg_create("AV_RSSB_MAIN_CONF", "./conf/main.conf");
|
||||
wired_cfg_init(main_conf_handle);
|
||||
rssb_conf_handle=wired_cfg_create("AV_RSSB_REASSEMBLY_CONF", "./conf/frag_reassembly.conf");
|
||||
wired_cfg_init(rssb_conf_handle);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -4,10 +4,6 @@
|
||||
#include <sys/un.h>
|
||||
#include </usr/include/stdint.h>
|
||||
|
||||
#define APP_FUNC 0 //<2F>ֻ<EFBFBD>APP
|
||||
#define VOIP_FUNC 1 //VOIP <20><>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>һ<EFBFBD><D2BB>
|
||||
#define PIC_FUNC 0 //PIC <20><>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>һ<EFBFBD><D2BB>
|
||||
|
||||
#include "MESA_list_queue.h"
|
||||
#include "MESA_htable.h"
|
||||
#include "MESA_trace.h"
|
||||
|
||||
Reference in New Issue
Block a user