diff options
author | 2015-08-30 11:41:42 +0300 | |
---|---|---|
committer | 2015-08-30 11:41:42 +0300 | |
commit | c9381643e7bf9b3dc690bf3e012ad6176ee32b8c (patch) | |
tree | ff0e91ee5c38f2caaeaa53340ecf2db2a326455a /linux | |
parent | 05a529031e962d61ab977393fb3d153931feff34 (diff) | |
parent | 53f0e28d7f30c7175cbb15884c309613593859d8 (diff) |
Merge branch 'master' into rpc
Conflicts:
linux/ws_main.py
linux_dpdk/ws_main.py
Diffstat (limited to 'linux')
-rwxr-xr-x | linux/ws_main.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/ws_main.py b/linux/ws_main.py index 659d4921..e2364be4 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -172,7 +172,7 @@ rpc_server_mock = SrcGroups([cmn_src, json_src ]) -yaml_src = SrcGroup(dir='yaml-cpp/src/', +yaml_src = SrcGroup(dir='external_libs/yaml-cpp/src/', src_list=[ 'aliasmanager.cpp', 'binary.cpp', @@ -223,11 +223,11 @@ cxxflags_base =['-DWIN_UCODE_SIM', includes_path =''' ../src/pal/linux/ - ../src/zmq/include/ ../src/ ../src/rpc-server/ ../external_libs/json/ - ../yaml-cpp/include/ + ../external_libs/zmq/include/ + ../external_libs/yaml-cpp/include/ '''; @@ -359,7 +359,7 @@ build_types = [ def build_prog (bld, build_obj): - zmq_lib_path='src/zmq/' + zmq_lib_path='external_libs/zmq/' bld.read_shlib( name='zmq' , paths=[top + zmq_lib_path] ) bld.program(features='cxx cxxprogram', |