diff options
| author |   Dan Klein <danklei@cisco.com> | 2015-08-24 18:44:56 +0300 |
|---|---|---|
| committer | Dan Klein <danklei@cisco.com> | 2015-08-24 18:44:56 +0300 |
| commit | 98bc71b1c21452c3d868c4a4d418a8aeaa5a43af (patch) | |
| tree | 2e66b9a775f0a5c545caa76f62890f5a5546e231 /linux_dpdk/ws_main.py | |
| parent | 20eb7d362f9bce1951bd61ad3f78cf8f4267d1d5 (diff) | |
| parent | 36c6c87fe4380b214f8ff8a45dc0213fa109821c (diff) | |
Merge branch 'master' into dan_stateless
Diffstat (limited to 'linux_dpdk/ws_main.py')
| -rwxr-xr-x | linux_dpdk/ws_main.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 997c80fb..817950f3 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -131,7 +131,7 @@ net_src = SrcGroup(dir='src/common/Network/Packet', 'VLANHeader.cpp']); # JSON package -json_src = SrcGroup(dir='external_libs/json', +json_src = SrcGroup(dir='external_libs/cpp/json', src_list=[ 'jsoncpp.cpp' ]) @@ -149,12 +149,12 @@ rpc_server_src = SrcGroup(dir='src/rpc-server/src', ]) # JSON package -json_src = SrcGroup(dir='external_libs/json', +json_src = SrcGroup(dir='external_libs/cpp/json', src_list=[ 'jsoncpp.cpp' ]) -yaml_src = SrcGroup(dir='yaml-cpp/src/', +yaml_src = SrcGroup(dir='external_libs/cpp/yaml-cpp/src/', src_list=[ 'aliasmanager.cpp', 'binary.cpp', @@ -398,10 +398,13 @@ common_flags_old = common_flags + [ includes_path =''' ../src/pal/linux_dpdk/ ../src/ - ../external_libs/json/ + ../src/rpc-server/include - ../yaml-cpp/include/ - ../src/zmq/include/ + + ../external_libs/cpp/yaml-cpp/include/ + ../external_libs/cpp/zmq/include/ + ../external_libs/cpp/json/ + ../src/dpdk_lib18/librte_eal/linuxapp/eal/include/ ../src/dpdk_lib18/librte_eal/common/include/ ../src/dpdk_lib18/librte_eal/common/ @@ -590,7 +593,7 @@ build_types = [ def build_prog (bld, build_obj): - zmq_lib_path='src/zmq/' + zmq_lib_path='external_libs/cpp/zmq/' bld.read_shlib( name='zmq' , paths=[top+zmq_lib_path] ) #rte_libs =[ |