From 52bd84663ef5bff417588dccd324937d506b9d95 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 四月 2017 18:38:13 +0800
Subject: [PATCH] optimize

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

diff --git a/FaceServer/make.sh b/FaceServer/make.sh
index b0d607e..670e598 100644
--- a/FaceServer/make.sh
+++ b/FaceServer/make.sh
@@ -2,24 +2,26 @@
 
 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"
 
-STFACESDK_BASE=/opt/st_face-6.3.1-verify_p1-linux-524d0c3
+STFACESDK_BASE=/opt/st_face
 STFACESDK_INC="-I$STFACESDK_BASE/include"
-STFACESDK_LIB="-L$STFACESDK_BASE/libs/linux-x86_64"
+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_LIB=`pkg-config --libs-only-l opencv`
+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 -I$VISITFACE_BASE $PROTOBUF_INC $STFACESDK_INC $LIBYUV_INC "
-LDFLAGS+="-pthread -levent $PROTOBUF_LIB $STFACESDK_LIB $OPENCV_LIB $LIBYUV_LIB " # -lcvface_api 
+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 test_client_detect test_client_add
@@ -27,10 +29,10 @@
 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++ $VISITFACE_BASE/PbFaceList.pb.cc $CFLAGS $CPPFLAGS
+g++ PbFaceList.pb.cc $CFLAGS $CPPFLAGS
 g++ main_face_daemon.cpp $CFLAGS $CPPFLAGS
 g++ sample_face_search.cpp $CFLAGS $CPPFLAGS
-g++ pseudo_stfacesdk.cpp $CFLAGS $CPPFLAGS
+#g++ pseudo_stfacesdk.cpp $CFLAGS $CPPFLAGS
 g++ STFaceCache.cpp $CFLAGS $CPPFLAGS
 
 g++ test_client_detect.cpp $CFLAGS $CPPFLAGS
@@ -43,7 +45,6 @@
   PbFaceList.pb.o \
   main_face_daemon.o \
   sample_face_search.o \
-  pseudo_stfacesdk.o \
   STFaceCache.o \
   $LDFLAGS -o face_server
 #
@@ -58,4 +59,4 @@
   $LDFLAGS -o test_client_add
 #
 
-#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/protobuf/inst/lib:/opt/st_face-6.3.1-verify_p1-linux-524d0c3/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

--
Gitblit v1.8.0