From e634f49a3b619017a3d040d1bdf68aebad07ae4f Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 05 三月 2019 09:26:54 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
QiaoJiaSystem/EncodeServer/CMakeLists.txt | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/EncodeServer/CMakeLists.txt b/QiaoJiaSystem/EncodeServer/CMakeLists.txt
index 146deb4..c5685b6 100644
--- a/QiaoJiaSystem/EncodeServer/CMakeLists.txt
+++ b/QiaoJiaSystem/EncodeServer/CMakeLists.txt
@@ -77,19 +77,21 @@
../../../BasicPlatForm/libs/openssl/lib
../../../BasicPlatForm/libs/opencv/lib
../../../BasicPlatForm/libs/ffmpeg/lib
-# ../../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
# ../../../BasicPlatForm/libs/libuuid/lib
- ../../BasicPlatForm/libs/hiredis-master/lib
+ ../../../BasicPlatForm/libs/hiredis-master/lib
)
add_executable(${PROJECT_NAME}
../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
../StructureApp/NewRecordVideoElement.cpp
- EncodeVideoManager.cpp
+ ../../../BasicPlatForm/basic/timer_counter/TimerRecorder.cpp
+
+ EncodeVideoManager.cpp
EncodeVideo.cpp
../StructureApp/HiredisTool.cpp
main.cpp
--
Gitblit v1.8.0