bug fix

houxiao

2017-04-25 521e435d5d63fc76097e6667ba5ef9bcd1393a7b

 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt

@@ -1,43 +1,66 @@
cmake_minimum_required(VERSION 3.4.1)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -UNDEBUG")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static  -Wall -UNDEBUG")

add_library(native-codec-jni SHARED
            looper.cpp
            native-codec-jni.cpp
            "D:/workspace/proxy/RtspFace/Logger/src/logger.cc")
#debug for video only test
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -fno-rtti  -Wall -UNDEBUG")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG")

add_library(rtspface SHARED
            RtspNativeCodecJNI.cpp
            CameraWrapper.cpp
            FaceCache.cpp
            PbFaceList.pb.cc
            DebugNetwork.cpp

            "D:/workspace/proxy/RtspFace/PipeLine.cpp"
            "D:/workspace/proxy/RtspFace/Logger/src/logger.cc"
         "D:/workspace/proxy/RtspFace/MediaHelper.cpp"
            "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp"
            "D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp"
            "D:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp"
            "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp"

            "D:/workspace/proxy/FaceServer/proto_hton_ntoh.cpp"
            )

# Include libraries needed for native-codec-jni lib
target_link_libraries(native-codec-jni
target_link_libraries(rtspface
                      android
                      log
                      mediandk
                      OpenMAXAL)
                      OpenMAXAL
                 #gui
                 jnigraphics
                 )

include_directories("D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include"
include_directories("D:/workspace/proxy/FaceServer"

                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include"
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock"
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"

                    "D:/workspace/JniHelpers/src/main/cpp")
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include"

target_link_libraries(native-codec-jni
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libliveMedia.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libgroupsock.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libBasicUsageEnvironment.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libUsageEnvironment.a")
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include"

                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include"

                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include"
                    )

target_link_libraries(rtspface
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a"

                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so"
                      )

include_directories("D:/workspace/proxy/RtspFace")

add_library(rtspface STATIC
            "D:/workspace/proxy/RtspFace/PipeLine.cpp"
            "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp")
target_link_libraries(native-codec-jni rtspface)


#file(GLOB libJniHelpers_SOURCES D:/workspace/JniHelpers/src/main/cpp/*.cpp)
#file(GLOB libJniHelpers_HEADERS D:/workspace/JniHelpers/src/main/cpp/*.h)
#add_library(JniHelpers ${libJniHelpers_SOURCES} ${libJniHelpers_HEADERS})
#target_link_libraries(native-codec-jni JniHelpers)