diff options
| author |   Dan Klein <danklei@cisco.com> | 2015-08-26 18:16:09 +0300 |
|---|---|---|
| committer | Dan Klein <danklei@cisco.com> | 2015-08-26 18:16:09 +0300 |
| commit | f8ac9d14a989c8cf1535e16165551dfa370b0b74 (patch) | |
| tree | 43e396eb5d096ad74ec02afeccf8995a4d241a0f /linux/ws_main.py | |
| parent | cdcc62972d42f009f55e6aeb2ca5c60c3acd75eb (diff) | |
| parent | 53f0e28d7f30c7175cbb15884c309613593859d8 (diff) | |
Merge branch 'master' into dan_stateless
Diffstat (limited to 'linux/ws_main.py')
| -rwxr-xr-x | linux/ws_main.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/ws_main.py b/linux/ws_main.py index 1f096788..505853b6 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -159,7 +159,7 @@ rpc_server_mock_src = SrcGroup(dir='src/rpc-server/src', ]) # JSON package -json_src = SrcGroup(dir='external_libs/cpp/json', +json_src = SrcGroup(dir='external_libs/json', src_list=[ 'jsoncpp.cpp' ]) @@ -170,7 +170,7 @@ rpc_server_mock = SrcGroups([cmn_src, json_src ]) -yaml_src = SrcGroup(dir='external_libs/cpp/yaml-cpp/src/', +yaml_src = SrcGroup(dir='external_libs/yaml-cpp/src/', src_list=[ 'aliasmanager.cpp', 'binary.cpp', @@ -223,9 +223,9 @@ cxxflags_base =['-DWIN_UCODE_SIM', includes_path =''' ../src/pal/linux/ ../src/ ../src/rpc-server/include - ../external_libs/cpp/json/ - ../external_libs/cpp/zmq/include/ - ../external_libs/cpp/yaml-cpp/include/ + ../external_libs/json/ + ../external_libs/zmq/include/ + ../external_libs/yaml-cpp/include/ '''; @@ -357,7 +357,7 @@ build_types = [ def build_prog (bld, build_obj): - zmq_lib_path='external_libs/cpp/zmq/' + zmq_lib_path='external_libs/zmq/' bld.read_shlib( name='zmq' , paths=[top + zmq_lib_path] ) bld.program(features='cxx cxxprogram', |