Hu Chunming / FFNvDecoder

Commit 429e8f865f95e8bcb757c526c00e001807928bfe

Authored by Hu Chunming
2 parents 88991c98 28925304

Merge branch 'dev-cmhu' of 192.168.10.182:ming/FFNvDecoder into dev-cmhu

Inline Side-by-side
Showing 9 changed files with 138 additions and 87 deletions
src/Makefile
  View file @429e8f8
... ... @@ -7,7 +7,7 @@ BUILD_DIR:=$(TOP_DIR)/build
7 7 BIN_DIR:=$(BUILD_DIR)/bin
8 8 export BUILD_DIR
9 9  
10   -PROJECT_ROOT= /mnt/data/cmhu/FFNvDecoder
  10 +PROJECT_ROOT= /home/huchunming/FFNvDecoder
11 11 THIRDPARTY_ROOT = $(PROJECT_ROOT)/3rdparty
12 12 export PROJECT_ROOT THIRDPARTY_ROOT
13 13  
... ... @@ -24,16 +24,16 @@ INCS:=-I $(TOP_DIR) \
24 24 -I $(SPDLOG_ROOT)/include \
25 25 -I $(FFMPEG_DIR)/include \
26 26  
27   -MACROS:=
28   -
29 27 # 链接器
30   -LIBS:= -L $(SPDLOG_ROOT) -l:libspdlog.a \
  28 +LIBS:= -L $(SPDLOG_ROOT)/lib -l:libspdlog.a \
31 29 -L $(FFMPEG_DIR)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice \
32 30  
33 31 export CXX INCS MACROS LIBS
34 32  
  33 +MACROS:= -DUSE_DVPP
  34 +
35 35 # 各个模块
36   -MODULES:= nvdec gb28181 interface demo
  36 +MODULES:= dvpp interface demo
37 37  
38 38 # 各个模块对应的库
39 39 # MODULE_LIBS:=$(BUILD_DIR)/nvdec/lib/nvdec.a\
... ... @@ -50,7 +50,7 @@ all:$(TARGET)
50 50 # 最终目标依赖关系
51 51 $(TARGET):FORCE | $(BIN_DIR)
52 52 @for n in $(MODULES); do make -s -f $(TOP_DIR)/$$n/Makefile MODULE=$$n || exit "$$?"; done
53   - @echo -e "\e[32m""Linking executable $(TARGET)""\e[0m"
  53 +# @echo -e "\e[32m""Linking executable $(TARGET)""\e[0m"
54 54 #@$(LD) $(LDFLAGS) -o $@ $(MODULE_LIBS) $(LIBS)
55 55  
56 56 # 若没有bin目录则自动生成
... ...
src/demo/Makefile
  View file @429e8f8
... ... @@ -12,30 +12,32 @@ DEPS:=$(addprefix $(DEP_DIR)/, $(patsubst %.cpp, %.d,a $(SRCS)))
12 12 # 自动生成头文件依赖选项
13 13 DEPFLAGS=-MT $@ -MMD -MP -MF $(DEP_DIR)/$*.d
14 14  
  15 +DEFS = -DENABLE_DVPP_INTERFACE
  16 +
15 17 # 最终目标文件
16   -TARGET:=/mnt/data/cmhu/FFNvDecoder/bin/lib/demo
  18 +TARGET:=$(BUILD_DIR)/bin/demo
  19 +
17 20  
  21 +include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/runtime/include
18 22  
19   -JRTP_ROOT = $(THIRDPARTY_ROOT)/jrtp_export
  23 +lib_dir=-L/usr/lib \
  24 + -L/usr/local/lib \
  25 + -L/usr/local/Ascend/driver/lib64 \
  26 + -L/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/atc/lib64\
  27 + -L/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/runtime/lib64 \
  28 + -L/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/runtime/lib64/stub \
  29 + -L/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/lib64 \
  30 + -L/usr/local/Ascend/driver/lib64/driver
  31 +
  32 +lib=-lacl_dvpp -lascendcl -lmmpa -lglog -lgflags -lpthread -lz -lacl_dvpp_mpi -lruntime -lascendalog -lc_sec -lmsprofiler -lgert -lge_executor -lge_common \
  33 + -lgraph -lascend_protobuf -lprofapi -lerror_manager -lexe_graph -lregister -lplatform
20 34  
21 35 INCLUDE= -I $(TOP_DIR)/interface \
22   - -I $(TOP_DIR)/nvdec \
23   - -I $(TOP_DIR)/gb28181 \
24   - -I $(CUDA_ROOT)/include \
25   - -I $(TOP_DIR)/common/inc \
26   - -I $(TOP_DIR)/common/UtilNPP \
27   - -I $(TOP_DIR)/ \
28   - -I $(JRTP_ROOT)/jrtplib/include/jrtplib3 \
29   - -I $(JRTP_ROOT)/jthread/include/jthread
30 36  
31 37 LIBSPATH= -L $(BUILD_DIR)/interface/lib -l:interface.a \
32   - -L $(BUILD_DIR)/nvdec/lib -l:nvdec.a \
33   - -L $(BUILD_DIR)/gb28181/lib -l:gb28181.a \
34   - -L $(CUDA_ROOT)/lib64 -lcuda -lcudart -lnvcuvid -lcurand -lcublas -lnvjpeg \
35   - -L $(JRTP_ROOT)/jthread/lib -l:libjthread.a \
36   - -L $(JRTP_ROOT)/jrtplib/lib -l:libjrtp.a
  38 + -L $(BUILD_DIR)/dvpp/lib -l:dvpp.a
37 39  
38   -CXXFLAGS= -g -O0 -fPIC $(INCLUDE) $(LIBSPATH) $(INCS) $(LIBS) $(MACROS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl -Wwrite-strings
  40 +CXXFLAGS= -g -O0 -fPIC $(INCLUDE) $(include_dir) $(LIBSPATH) $(INCS) $(LIBS) $(lib_dir) $(lib) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl
39 41 # -DUNICODE -D_UNICODE
40 42  
41 43 # 默认最终目标
... ... @@ -45,8 +47,8 @@ all:$(TARGET)
45 47 # 生成最终目标
46 48 $(TARGET): $(OBJS) | $(LIB_DIR)
47 49 @echo -e "\e[32m""Linking static library $(TARGET)""\e[0m"
48   - @echo -e "$(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(LIBSPATH) $(MACROS)"
49   - $(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(LIBSPATH) $(MACROS)
  50 + @echo -e "$(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(MACROS)"
  51 + $(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(MACROS)
50 52  
51 53 # 若没有lib目录则自动生成
52 54 $(LIB_DIR):
... ...
src/demo/Makefile.dvpp
  View file @429e8f8
1   -XX = g++
  1 +# 各项目录
  2 +LIB_DIR:=$(BUILD_DIR)/$(MODULE)/lib
  3 +DEP_DIR:=$(BUILD_DIR)/$(MODULE)/.dep
  4 +OBJ_DIR:=$(BUILD_DIR)/$(MODULE)/obj
  5 +SRC_DIR:=$(TOP_DIR)/$(MODULE)
2 6  
  7 +# 源文件以及中间目标文件和依赖文件
  8 +SRCS:=$(notdir $(wildcard $(SRC_DIR)/*.cpp))
  9 +OBJS:=$(addprefix $(OBJ_DIR)/, $(patsubst %.cpp, %.o, $(SRCS)))
  10 +DEPS:=$(addprefix $(DEP_DIR)/, $(patsubst %.cpp, %.d,a $(SRCS)))
3 11  
4   -PROJECT_ROOT= /mnt/data/cmhu/FFNvDecoder
5   -
6   -SRC_ROOT = $(PROJECT_ROOT)/src
7   -
8   -TARGET= $(PROJECT_ROOT)/src/build/bin/demo
  12 +# 自动生成头文件依赖选项
  13 +DEPFLAGS=-MT $@ -MMD -MP -MF $(DEP_DIR)/$*.d
9 14  
10 15 DEFS = -DENABLE_DVPP_INTERFACE
11 16  
  17 +# 最终目标文件
  18 +TARGET:=$(BUILD_DIR)/bin/demo
  19 +
12 20  
13 21 include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/runtime/include
14 22  
... ... @@ -23,26 +31,50 @@ lib_dir=-L/usr/lib \
23 31  
24 32 lib=-lacl_dvpp -lascendcl -lmmpa -lglog -lgflags -lpthread -lz -lacl_dvpp_mpi -lruntime -lascendalog -lc_sec -lmsprofiler -lgert -lge_executor -lge_common \
25 33 -lgraph -lascend_protobuf -lprofapi -lerror_manager -lexe_graph -lregister -lplatform
26   -LIBS= -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice
27   -CXXFLAGS= -g -O0 -fPIC $(INCLUDE) $(include_dir) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl
28 34  
29   -SRCS:=$(wildcard $(SRC_ROOT)/demo/*.cpp)
30   -OBJS = $(patsubst %.cpp, %.o, $(notdir $(SRCS)))
  35 +INCLUDE= -I $(TOP_DIR)/interface \
  36 +
  37 +LIBSPATH= -L $(BUILD_DIR)/interface/lib -l:interface.a \
  38 + -L $(BUILD_DIR)/dvpp/lib -l:dvpp.a
31 39  
32   -OBJ_ROOT = $(PROJECT_ROOT)/src/build
33   -DVPP_SRCS:=$(wildcard $(OBJ_ROOT)/dvpp/obj/*.o)
34   -INTEFACE_SRCS:=$(wildcard $(OBJ_ROOT)/interface/obj/*.o)
  40 +CXXFLAGS= -g -O0 -fPIC $(INCLUDE) $(include_dir) $(LIBSPATH) $(INCS) $(LIBS) $(lib_dir) $(lib) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl
  41 + # -DUNICODE -D_UNICODE
35 42  
  43 +# 默认最终目标
  44 +.PHONY:all
  45 +all:$(TARGET)
36 46  
37   -$(TARGET):$(OBJS) $(INTEFACE_SRCS) $(NVDECODER_SRCS) $(GB28181_SRCS)
38   - rm -f $(TARGET)
  47 +# 生成最终目标
  48 +$(TARGET): $(OBJS) | $(LIB_DIR)
  49 + @echo -e "\e[32m""Linking static library $(TARGET)""\e[0m"
  50 + @echo -e "$(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(MACROS)"
  51 + $(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(MACROS)
  52 +
  53 +# 若没有lib目录则自动生成
  54 +$(LIB_DIR):
  55 + @mkdir -p $@
  56 +
  57 +# 生成中间目标文件
  58 +$(OBJ_DIR)/%.o:$(SRC_DIR)/%.cpp $(DEP_DIR)/%.d | $(OBJ_DIR) $(DEP_DIR)
39 59 @echo -e "\e[33m""Building object $@""\e[0m"
40   - $(XX) -o $@ $^ $(CXXFLAGS) $(LIBS) $(lib_dir) $(lib) -Wwrite-strings
41   - rm -f *.o
  60 + @echo -e "$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $<"
  61 + $(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $<
  62 +
  63 +# 若没有obj目录则自动生成
  64 +$(OBJ_DIR):
  65 + @mkdir -p $@
  66 +
  67 +# 若没有.dep目录则自动生成
  68 +$(DEP_DIR):
  69 + @mkdir -p $@
42 70  
43   -%.o:$(SRC_ROOT)/demo/%.cpp
44   - $(XX) $(CXXFLAGS) -c $<
  71 +# 依赖文件会在生成中间文件的时候自动生成，这里只是为了防止报错
  72 +$(DEPS):
45 73  
  74 +# 引入中间目标文件头文件依赖关系
  75 +include $(wildcard $(DEPS))
46 76  
  77 +# 直接删除组件build目录
  78 +.PHONY:clean
47 79 clean:
48   - rm -f *.o $(TARGET)
49 80 \ No newline at end of file
  81 + @rm -rf $(BUILD_DIR)/$(MODULE)
... ...
src/demo/Makefile.o.nvdec
  View file @429e8f8
1   -XX = g++
  1 +# 各项目录
  2 +LIB_DIR:=$(BUILD_DIR)/$(MODULE)/lib
  3 +DEP_DIR:=$(BUILD_DIR)/$(MODULE)/.dep
  4 +OBJ_DIR:=$(BUILD_DIR)/$(MODULE)/obj
  5 +SRC_DIR:=$(TOP_DIR)/$(MODULE)
2 6  
  7 +# 源文件以及中间目标文件和依赖文件
  8 +SRCS:=$(notdir $(wildcard $(SRC_DIR)/*.cpp))
  9 +OBJS:=$(addprefix $(OBJ_DIR)/, $(patsubst %.cpp, %.o, $(SRCS)))
  10 +DEPS:=$(addprefix $(DEP_DIR)/, $(patsubst %.cpp, %.d,a $(SRCS)))
3 11  
4   -PROJECT_ROOT= /mnt/data/cmhu/FFNvDecoder
  12 +# 自动生成头文件依赖选项
  13 +DEPFLAGS=-MT $@ -MMD -MP -MF $(DEP_DIR)/$*.d
5 14  
6   -CUDA_ROOT = /usr/local/cuda-11.1
  15 +# 最终目标文件
  16 +TARGET:=/mnt/data/cmhu/FFNvDecoder/bin/lib/demo
7 17  
8   -DEPEND_DIR = $(PROJECT_ROOT)/bin
9   -THIRDPARTY_ROOT = $(PROJECT_ROOT)/3rdparty
10   -SPDLOG_ROOT = $(THIRDPARTY_ROOT)/spdlog-1.9.2/release
11   -JRTP_ROOT = $(THIRDPARTY_ROOT)/jrtp_export
12   -
13   -SRC_ROOT = $(PROJECT_ROOT)/src
14 18  
15   -TARGET= $(PROJECT_ROOT)/bin/lib/demo
16   -
17   -DEFS = -DENABLE_DVPP_INTERFACE
  19 +JRTP_ROOT = $(THIRDPARTY_ROOT)/jrtp_export
18 20  
19   -INCLUDE= -I $(SRC_ROOT)/interface \
20   - -I $(SRC_ROOT)/dvpp \
21   - -I $(SRC_ROOT)/gb28181 \
22   - -I $(SRC_ROOT)/nvdec \
23   - -I $(DEPEND_DIR)/include \
  21 +INCLUDE= -I $(TOP_DIR)/interface \
  22 + -I $(TOP_DIR)/nvdec \
  23 + -I $(TOP_DIR)/gb28181 \
24 24 -I $(CUDA_ROOT)/include \
25 25 -I $(TOP_DIR)/common/inc \
26 26 -I $(TOP_DIR)/common/UtilNPP \
27 27 -I $(TOP_DIR)/ \
28   - -I $(SPDLOG_ROOT)/include \
29 28 -I $(JRTP_ROOT)/jrtplib/include/jrtplib3 \
30 29 -I $(JRTP_ROOT)/jthread/include/jthread
31 30  
32   -LIBSPATH= -L $(DEPEND_DIR)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice \
  31 +LIBSPATH= -L $(BUILD_DIR)/interface/lib -l:interface.a \
  32 + -L $(BUILD_DIR)/nvdec/lib -l:nvdec.a \
  33 + -L $(BUILD_DIR)/gb28181/lib -l:gb28181.a \
33 34 -L $(CUDA_ROOT)/lib64 -lcuda -lcudart -lnvcuvid -lcurand -lcublas -lnvjpeg \
34   - -L $(SPDLOG_ROOT) -l:libspdlog.a \
35 35 -L $(JRTP_ROOT)/jthread/lib -l:libjthread.a \
36 36 -L $(JRTP_ROOT)/jrtplib/lib -l:libjrtp.a
37 37  
  38 +CXXFLAGS= -g -O0 -fPIC $(INCLUDE) $(LIBSPATH) $(INCS) $(LIBS) $(MACROS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl -Wwrite-strings
  39 + # -DUNICODE -D_UNICODE
38 40  
39   -CXXFLAGS= -g -O0 -fPIC $(INCLUDE) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl
  41 +# 默认最终目标
  42 +.PHONY:all
  43 +all:$(TARGET)
40 44  
41   -SRCS:=$(wildcard $(SRC_ROOT)/demo/*.cpp)
42   -OBJS = $(patsubst %.cpp, %.o, $(notdir $(SRCS)))
  45 +# 生成最终目标
  46 +$(TARGET): $(OBJS) | $(LIB_DIR)
  47 + @echo -e "\e[32m""Linking static library $(TARGET)""\e[0m"
  48 + @echo -e "$(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(LIBSPATH) $(MACROS)"
  49 + $(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(LIBSPATH) $(MACROS)
43 50  
44   -OBJ_ROOT = $(PROJECT_ROOT)/src/build
45   -INTEFACE_SRCS:=$(wildcard $(OBJ_ROOT)/interface/obj/*.o)
46   -NVDECODER_SRCS:=$(wildcard $(OBJ_ROOT)/nvdec/obj/*.o)
47   -GB28181_SRCS:=$(wildcard $(OBJ_ROOT)/gb28181/obj/*.o)
  51 +# 若没有lib目录则自动生成
  52 +$(LIB_DIR):
  53 + @mkdir -p $@
48 54  
49   -
50   -$(TARGET):$(OBJS) $(INTEFACE_SRCS) $(NVDECODER_SRCS) $(GB28181_SRCS)
51   - rm -f $(TARGET)
  55 +# 生成中间目标文件
  56 +$(OBJ_DIR)/%.o:$(SRC_DIR)/%.cpp $(DEP_DIR)/%.d | $(OBJ_DIR) $(DEP_DIR)
52 57 @echo -e "\e[33m""Building object $@""\e[0m"
53   - $(XX) -o $@ $^ $(CXXFLAGS) $(LIBSPATH) -Wwrite-strings
54   - rm -f *.o
  58 + @echo -e "$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $<"
  59 + $(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $<
  60 +
  61 +# 若没有obj目录则自动生成
  62 +$(OBJ_DIR):
  63 + @mkdir -p $@
  64 +
  65 +# 若没有.dep目录则自动生成
  66 +$(DEP_DIR):
  67 + @mkdir -p $@
55 68  
56   -%.o:$(SRC_ROOT)/demo/%.cpp
57   - $(XX) $(CXXFLAGS) -c $<
  69 +# 依赖文件会在生成中间文件的时候自动生成，这里只是为了防止报错
  70 +$(DEPS):
58 71  
  72 +# 引入中间目标文件头文件依赖关系
  73 +include $(wildcard $(DEPS))
59 74  
  75 +# 直接删除组件build目录
  76 +.PHONY:clean
60 77 clean:
61   - rm -f *.o $(TARGET)
62 78 \ No newline at end of file
  79 + @rm -rf $(BUILD_DIR)/$(MODULE)
... ...
src/demo/main_dvpp.cpp1 renamed to src/demo/main_dvpp.cpp
  View file @429e8f8
src/demo/main_nvdec.cpp renamed to src/demo/main_nvdec.cpp1
  View file @429e8f8
src/dvpp/Makefile
  View file @429e8f8
... ... @@ -15,7 +15,7 @@ DEPFLAGS=-MT $@ -MMD -MP -MF $(DEP_DIR)/$*.d
15 15 DEFS = -DENABLE_DVPP_INTERFACE
16 16  
17 17 # 最终目标文件
18   -TARGET:=$(LIB_DIR)/lib$(MODULE).a
  18 +TARGET:=$(LIB_DIR)/$(MODULE).a
19 19  
20 20 export LD_LIBRARY_PATH=/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/runtime/lib64:$LD_LIBRARY_PATH
21 21 export LD_LIBRARY_PATH=/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/lib64:$LD_LIBRARY_PATH
... ... @@ -25,7 +25,7 @@ include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/acllib/include
25 25 lib_dir=-L/usr/lib -L/usr/local/lib -L/usr/local/Ascend/ascend-toolkit/latest/acllib/lib64 -L/usr/local/Ascend/driver/lib64 -L/usr/local/Ascend/ascend-toolkit/latest/atc/lib64
26 26 lib=-lacl_dvpp -lascendcl -lmmpa -lglog -lgflags -lpthread -lz
27 27  
28   -CXXFLAGS= -g -O0 -fPIC $(include_dir) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl
  28 +CXXFLAGS= -g -O0 -fPIC $(include_dir) $(INCS) $(LIBS) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl
29 29 # -DUNICODE -D_UNICODE
30 30  
31 31 # 默认最终目标
... ... @@ -44,7 +44,7 @@ $(LIB_DIR):
44 44 # 生成中间目标文件
45 45 $(OBJ_DIR)/%.o:$(SRC_DIR)/%.cpp $(DEP_DIR)/%.d | $(OBJ_DIR) $(DEP_DIR)
46 46 @echo -e "\e[33m""Building object $@""\e[0m"
47   - @$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) $(INCS) $(LDFLAGS) $(lib_dir) $(lib) $(MACROS) -o $@ $<
  47 + @$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(lib_dir) $(lib) $(MACROS) -o $@ $<
48 48  
49 49 # 若没有obj目录则自动生成
50 50 $(OBJ_DIR):
... ...
src/interface/FFNvDecoderManager.h
  View file @429e8f8
... ... @@ -14,7 +14,7 @@ struct MgrDecConfig
14 14 string name{""}; // 解码器名称
15 15 };
16 16  
17   -#define USE_NVDEC
  17 +// #define USE_NVDEC
18 18 // #define USE_DVPP
19 19 /**
20 20 * 解码器管理类，单例类
... ...
src/nvdec/Makefile
  View file @429e8f8
... ... @@ -15,7 +15,7 @@ NVCC = $(CUDA_ROOT)/bin/nvcc
15 15 # 自动生成头文件依赖选项
16 16 DEPFLAGS=-MT $@ -MMD -MP -MF $(DEP_DIR)/$*.d
17 17  
18   -DEFS = -DENABLE_DVPP_INTERFACE
  18 +DEFS =
19 19  
20 20 # 最终目标文件
21 21 TARGET:=$(LIB_DIR)/$(MODULE).a
... ... @@ -34,7 +34,7 @@ LIBSPATH= -L $(JRTP_ROOT)/jthread/lib -l:libjthread.a \
34 34 -L $(JRTP_ROOT)/jrtplib/lib -l:libjrtp.a \
35 35 -L $(CUDA_ROOT)/lib64 -lcuda -lcudart -lnvcuvid -lcurand -lcublas -lnvjpeg \
36 36  
37   -CXXFLAGS= -g -O0 -fPIC $(INCLUDE) $(LIBSPATH) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl -Wwrite-strings
  37 +CXXFLAGS= -g -O0 -fPIC $(INCLUDE) $(LIBSPATH) $(DEFS) $(INCS) $(LIBS) $(MACROS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl -Wwrite-strings
38 38 # -DUNICODE -D_UNICODE
39 39  
40 40 NFLAGS_LIB=-g -c -shared -Xcompiler -fPIC
... ... @@ -61,8 +61,8 @@ $(LIB_DIR):
61 61 # 生成中间目标文件
62 62 $(OBJ_DIR)/%.o:$(SRC_DIR)/%.cpp $(DEP_DIR)/%.d | $(OBJ_DIR) $(DEP_DIR)
63 63 @echo -e "\e[33m""Building object $@""\e[0m"
64   - @echo "$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) $(INCS) $(LIBS) $(MACROS) -o $@ $<"
65   - @$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) $(INCS) $(LIBS) $(MACROS) -o $@ $<
  64 + @echo "$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $<"
  65 + @$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $<
66 66  
67 67 $(OBJ_DIR)%.o:$(SRC_DIR)/%.cu
68 68 @echo -e "\e[33m""Building object $@""\e[0m"
... ...