hicSDK/nvrServer.git

parent: 21afe7a2 | 补丁 | 提交 | ignore whitespace

wangzhengquan

2020-06-12 9f2f9eed5ca905c4641b296773ac21aaa735624d

hclib

28个文件已添加

2个文件已修改

	.gitignore	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Makefile	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	common/libusgcommon.a	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	common/libusgcommon.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	device/libhcnetdisk.a	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	device/libhcnetdisk.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	device/libnetdisk.a	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	device/libnetdisk.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libHCAlarm.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libHCCoreDevCfg.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libHCDisplay.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libHCGeneralCfgMgr.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libHCIndustry.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libHCPlayBack.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libHCPreview.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libHCVoiceTalk.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libStreamTransClient.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libSystemTransform.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libanalyzedata.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/HCNetSDKCom/libiconv2.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libAudioRender.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libHCCore.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libNPQos.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libPlayCtrl.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libSuperRender.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libcrypto.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libhcnetsdk.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libhpr.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libssl.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hclib/libz.so	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .gitignore

@@ -1,48 +1,34 @@
<<<<<<< HEAD
# Prerequisites
*.d

=======
>>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
# Compiled Object files
*.slo
*.lo
*.o
*.obj

<<<<<<< HEAD
# Precompiled Headers
*.gch
*.pch

=======
>>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
# Compiled Dynamic libraries
*.so
*.dylib
*.dll

<<<<<<< HEAD
# Fortran module files
*.mod
*.smod

=======
>>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app
<<<<<<< HEAD
*.tar
*.tar.gz
.vscode/
build/
=======
>>>>>>> 419dba7aed489a0f83267fde64396b396994fff8

 Makefile

@@ -17,6 +17,16 @@
    - ipcrm -S 146
    - ipcrm -S 8899


package:
    mkdir -p ./build/bin
    cp ./service/netdisk_service ./build/bin/
    mkdir -p ./build/common
    cp ./common/libusgcommon.a ./build/common
    cp ./common/libusgcommon.so ./build/common
    cp -a ./data ./build


tarname = basic_pack.tar.gz

tar:

 common/libusgcommon.a

Binary files differ

 common/libusgcommon.so

Binary files differ

 device/libhcnetdisk.a

Binary files differ

 device/libhcnetdisk.so

Binary files differ

 device/libnetdisk.a

Binary files differ

 device/libnetdisk.so

Binary files differ

 hclib/HCNetSDKCom/libHCAlarm.so

Binary files differ

 hclib/HCNetSDKCom/libHCCoreDevCfg.so

Binary files differ

 hclib/HCNetSDKCom/libHCDisplay.so

Binary files differ

 hclib/HCNetSDKCom/libHCGeneralCfgMgr.so

Binary files differ

 hclib/HCNetSDKCom/libHCIndustry.so

Binary files differ

 hclib/HCNetSDKCom/libHCPlayBack.so

Binary files differ

 hclib/HCNetSDKCom/libHCPreview.so

Binary files differ

 hclib/HCNetSDKCom/libHCVoiceTalk.so

Binary files differ

 hclib/HCNetSDKCom/libStreamTransClient.so

Binary files differ

 hclib/HCNetSDKCom/libSystemTransform.so

Binary files differ

 hclib/HCNetSDKCom/libanalyzedata.so

Binary files differ

 hclib/HCNetSDKCom/libiconv2.so

Binary files differ

 hclib/libAudioRender.so

Binary files differ

 hclib/libHCCore.so

Binary files differ

 hclib/libNPQos.so

Binary files differ

 hclib/libPlayCtrl.so

Binary files differ

 hclib/libSuperRender.so

Binary files differ

 hclib/libcrypto.so

Binary files differ

 hclib/libhcnetsdk.so

Binary files differ

 hclib/libhpr.so

Binary files differ

 hclib/libssl.so

Binary files differ

 hclib/libz.so

Binary files differ

			@@ -1,48 +1,34 @@
			<<<<<<< HEAD
			# Prerequisites
			*.d

			=======
			>>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
			# Compiled Object files
			*.slo
			*.lo
			*.o
			*.obj

			<<<<<<< HEAD
			# Precompiled Headers
			*.gch
			*.pch

			=======
			>>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
			# Compiled Dynamic libraries
			*.so
			*.dylib
			*.dll

			<<<<<<< HEAD
			# Fortran module files
			*.mod
			*.smod

			=======
			>>>>>>> 419dba7aed489a0f83267fde64396b396994fff8
			# Compiled Static libraries
			*.lai
			*.la
			*.a
			*.lib

			# Executables
			*.exe
			*.out
			*.app
			<<<<<<< HEAD
			*.tar
			*.tar.gz
			.vscode/
			build/
			=======
			>>>>>>> 419dba7aed489a0f83267fde64396b396994fff8

			@@ -17,6 +17,16 @@
			- ipcrm -S 146
			- ipcrm -S 8899


			package:
			mkdir -p ./build/bin
			cp ./service/netdisk_service ./build/bin/
			mkdir -p ./build/common
			cp ./common/libusgcommon.a ./build/common
			cp ./common/libusgcommon.so ./build/common
			cp -a ./data ./build


			tarname = basic_pack.tar.gz

			tar: