修改包路径

wangzhengquan

2020-06-13 c6a302283cee53d113d88db89c0a242576dbc8c4

修改包路径

 .gitignore

@@ -32,5 +32,3 @@
*.tar.gz
.vscode/
build/
*.a
*.so

 common/libusgcommon.a

Binary files differ

 common/libusgcommon.so

Binary files differ

 data/config.txt

@@ -4,8 +4,5 @@
# nng远程调用地址地址
remote_url=tcp://127.0.0.1:9988

# 海康包路径 
hclib=../hclib/

# 负责下载任务的线程池的数量
workers=4

 device/Makefile

@@ -2,8 +2,8 @@
# Makefile for common library.
#
ROOT=..
LDLIBS+=-Wl,-rpath=../hclib:../hclib/HCNetSDKCom:../common
LDDIR += -L../hclib -L../hclib/HCNetSDKCom
LDLIBS+=-Wl,-rpath=$(ROOT)/lib/hc:$(ROOT)/lib/hc/HCNetSDKCom:$(ROOT)/common
LDDIR += -L$(ROOT)/lib/hc -L$(ROOT)/lib/hc/HCNetSDKCom
LDLIBS += -lhcnetsdk -lhpr -lHCCore
LDLIBS += -lpthread  -ljsoncpp
LIB_NETDISK = libnetdisk.a

 device/libhcnetdisk.a

Binary files differ

 device/libhcnetdisk.so

Binary files differ

 device/libnetdisk.a

Binary files differ

 device/libnetdisk.so

Binary files differ

 device/test

Binary files differ

 lib/hc/HCNetSDKCom/libHCAlarm.so

Binary files differ

 lib/hc/HCNetSDKCom/libHCCoreDevCfg.so

Binary files differ

 lib/hc/HCNetSDKCom/libHCDisplay.so

Binary files differ

 lib/hc/HCNetSDKCom/libHCGeneralCfgMgr.so

Binary files differ

 lib/hc/HCNetSDKCom/libHCIndustry.so

Binary files differ

 lib/hc/HCNetSDKCom/libHCPlayBack.so

Binary files differ

 lib/hc/HCNetSDKCom/libHCPreview.so

Binary files differ

 lib/hc/HCNetSDKCom/libHCVoiceTalk.so

Binary files differ

 lib/hc/HCNetSDKCom/libStreamTransClient.so

Binary files differ

 lib/hc/HCNetSDKCom/libSystemTransform.so

Binary files differ

 lib/hc/HCNetSDKCom/libanalyzedata.so

Binary files differ

 lib/hc/HCNetSDKCom/libiconv2.so

Binary files differ

 lib/hc/HCNetSDK_Log_Switch.xml

 lib/hc/libAudioRender.so

Binary files differ

 lib/hc/libHCCore.so

Binary files differ

 lib/hc/libNPQos.so

Binary files differ

 lib/hc/libPlayCtrl.so

Binary files differ

 lib/hc/libSuperRender.so

Binary files differ

 lib/hc/libcrypto.so

Binary files differ

 lib/hc/libcrypto.so.1.0.0

Binary files differ

 lib/hc/libhcnetsdk.so

Binary files differ

 lib/hc/libhpr.so

Binary files differ

 lib/hc/libopenal.so.1

Binary files differ

 lib/hc/libssl.so

Binary files differ

 lib/hc/libz.so

Binary files differ

 service/Makefile

@@ -2,9 +2,11 @@
# Makefile for common library.
#
ROOT=..
LDLIBS+=-Wl,-rpath=$(ROOT)/hclib:$(ROOT)/hclib/HCNetSDKCom:$(ROOT)/common:$(ROOT)/device
LDDIR += -L$(ROOT)/device -L$(ROOT)/hclib -L$(ROOT)/hclib/HCNetSDKCom
LDLIBS += -lnetdisk
LDLIBS+=-Wl,-rpath=$(ROOT)/lib/hc:$(ROOT)/lib/hc/HCNetSDKCom:$(ROOT)/common
# 海康包路径
LDDIR += -L$(ROOT)/lib/hc -L$(ROOT)/lib/hc/HCNetSDKCom
LDLIBS +=
# 海康包
LDLIBS +=  -lhcnetsdk -lhpr -lHCCore 
LDLIBS += -ljsoncpp  -lnng  -lpthread


 service/core

Binary files differ

 service/netdisk_service

Binary files differ

 service/netdisk_service.c

@@ -206,7 +206,7 @@

  //海康设备环境初始化
  Netdisk_EnvConfig hcEnvConfig;
  hcEnvConfig.libpath = config.get("hclib");
  hcEnvConfig.libpath = "../lib/hc";
  HCNetdisk::netdisk_init(&hcEnvConfig);

 

 service/test

Binary files differ

 service/test_client

Binary files differ

 service/test_properties

Binary files differ

 service/test_queue

Binary files differ