Merge branch 'icode'

Change-Id: I1f2a1a1eeac694fe5b61ebbb6dd180837411d7c2

BCLOUD.client

@@ -10,8 +10,6 @@ CONFIGS('third-64/protobuf@protobuf_3-2-0-6274_PD_BL')
 CONFIGS('baidu/base/baidu-rpc@ci-base')
 CONFIGS('baidu/third-party/gflags@v2.0.0@git_branch')
 CONFIGS('baidu/third-party/glog@v0.3.x@git_branch')
-CONFIGS('baidu/third-party/opencv@master@git_branch')
-CONFIGS('baidu/third-party/protobuf@2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a@git_branch')
 
 #sub directory
 Directory('pdcodegen')

configure/BCLOUD

@@ -3,6 +3,13 @@
 
 WORKROOT('../../../../')
 ImportConfigsFrom('..')
+#
+#Preprocessor flags.
+CPPFLAGS(r'-D_GNU_SOURCE -D__STDC_LIMIT_MACROS')
+#CPPFLAGS(r'-DVERSION=\"%s\"' % SVN_LAST_CHANGED_REV())
+
+#C++ flags.
+CXXFLAGS('-g -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-deprecated -Wno-unused-parameter -Wno-unused-variable -Wno-unused-local-typedefs -Wno-sign-compare -std=c++11')
 
 INCPATHS('$INC')
 INCPATHS('$OUT_ROOT/third-64/protobuf/output/include')

sdk-cpp/BCLOUD

@@ -27,8 +27,6 @@ CONFIGS('baidu/third-party/gflags@v2.0.0@git_branch')
 CONFIGS('baidu/third-party/glog@v0.3.x@git_branch')
 CONFIGS('baidu/third-party/opencv@master@git_branch')
 
-DELETE_AUTO_LIBS('$OUT_ROOT/baidu/third-party/protobuf/output/lib/libprotobuf.a')
-DELETE_AUTO_LIBS('$OUT_ROOT/baidu/third-party/protobuf/output/lib/libprotobuf-lite.a')
 # DELETE_AUTO_LIBS('$OUT_ROOT/third-64/glog/output/lib/libglog.a')
 DELETE_AUTO_LIBS('$OUT_ROOT/third-64/gflags/output/lib/libgflags.a')
 DELETE_AUTO_LIBS('$OUT_ROOT/third-64/gflags/output/lib/libgflags_nothreads.a')