From 3a5f09c61a87adb8dba2cc4a5366893886ba1c1d Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 17:31:40 +0800
Subject: [PATCH] 接口初步完成

---
 FaceServer/make.sh |   59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/FaceServer/make.sh b/FaceServer/make.sh
index e15e9e6..f24a3c0 100644
--- a/FaceServer/make.sh
+++ b/FaceServer/make.sh
@@ -2,37 +2,74 @@
 
 PIPELINE_BASE=/opt/RtspFace
 
-VISITFACE_BASE=/opt/VisitFace/RtspNativeCodec/app/src/main/cpp
-
 PROTOBUF_BASE=/opt/protobuf/inst
 PROTOBUF_INC="-I$PROTOBUF_BASE/include"
 PROTOBUF_LIB="-L$PROTOBUF_BASE/lib -lprotobuf"
 
-CPPFLAGS+="-g -c -std=c++11 -pthread -I$PIPELINE_BASE -I$VISITFACE_BASE $PROTOBUF_INC "
-LDFLAGS+="-pthread -levent $PROTOBUF_LIB "
+STFACESDK_BASE=/opt/st_face
+STFACESDK_INC="-I$STFACESDK_BASE/include"
+STFACESDK_LIB="-L$STFACESDK_BASE/libs/linux-x86_64/lib_dummy -lcvface_api"
+
+LIBYUV_BASE=/opt/libyuv/inst
+LIBYUV_INC="-I$LIBYUV_BASE/include"
+LIBYUV_LIB="-L$LIBYUV_BASE/lib -lyuv"
+
+OPENCV_BASE=/opt/opencv/inst
+OPENCV_INC="-I$OPENCV_BASE/include"
+OPENCV_LIB="$OPENCV_BASE/lib"
+OPENCV_LIB=`PKG_CONFIG_PATH=$OPENCV_LIB/pkgconfig pkg-config --libs-only-l opencv`
+OPENCV_LIB="-L$OPENCV_BASE/lib $OPENCV_LIB"
+
+CPPFLAGS+="-g -c -std=c++11 -pthread -DSERVER_PORT=15432 -DSTFACESDK_BASE=\"$STFACESDK_BASE\" -I$PIPELINE_BASE $PROTOBUF_INC $STFACESDK_INC $OPENCV_INC $LIBYUV_INC "
+LDFLAGS+="-pthread -levent $PROTOBUF_LIB $STFACESDK_LIB $OPENCV_LIB $LIBYUV_LIB "
 
 rm *.o
-rm face_server
-rm test_client
+rm face_server test_client_detect test_client_add test_client_compare test_client_search
 
 g++ $PIPELINE_BASE/Logger/src/logger.cc $CFLAGS $CPPFLAGS
 g++ ev_server.cpp -DUSER_DEFINE_EVCLIENT_PROC $CFLAGS $CPPFLAGS
+g++ proto_hton_ntoh.cpp $CFLAGS $CPPFLAGS
+g++ PbFaceList.pb.cc $CFLAGS $CPPFLAGS
 g++ main_face_daemon.cpp $CFLAGS $CPPFLAGS
-g++ $VISITFACE_BASE/PbFaceList.pb.cc $CFLAGS $CPPFLAGS
+g++ sample_face_search.cpp $CFLAGS $CPPFLAGS
+#g++ pseudo_stfacesdk.cpp $CFLAGS $CPPFLAGS
+g++ STFaceCache.cpp $CFLAGS $CPPFLAGS
 
-g++ test_client.cpp $CFLAGS $CPPFLAGS
+g++ test_client_detect.cpp $CFLAGS $CPPFLAGS
+g++ test_client_add.cpp $CFLAGS $CPPFLAGS
+g++ test_client_compare.cpp $CFLAGS $CPPFLAGS
+g++ test_client_search.cpp $CFLAGS $CPPFLAGS
 
 g++ -g -std=c++11 \
   logger.o \
   ev_server.o \
+  proto_hton_ntoh.o \
   PbFaceList.pb.o \
   main_face_daemon.o \
+  sample_face_search.o \
+  STFaceCache.o \
   $LDFLAGS -o face_server
 #
 
 g++ -g -std=c++11 \
-  test_client.o \
-  $LDFLAGS -o test_client
+  test_client_detect.o \
+  $LDFLAGS -o test_client_detect
 #
 
-#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/protobuf/inst/lib
+g++ -g -std=c++11 \
+  test_client_add.o \
+  $LDFLAGS -o test_client_add
+#
+
+g++ -g -std=c++11 \
+  test_client_compare.o proto_hton_ntoh.o logger.o \
+  $LDFLAGS -o test_client_compare
+#
+
+g++ -g -std=c++11 \
+  test_client_search.o proto_hton_ntoh.o logger.o \
+  $LDFLAGS -o test_client_search
+#
+
+#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/protobuf/inst/lib:/opt/opencv/inst/lib:/opt/st_face/libs/linux-x86_64
+#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/protobuf/inst/lib:/opt/opencv/inst/lib:/opt/st_face/libs/linux-x86_64:/opt/opencv/lib

--
Gitblit v1.8.0