diff options
| author |   imarom <imarom@cisco.com> | 2015-08-24 17:52:52 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-08-24 17:52:52 +0300 |
| commit | 36c6c87fe4380b214f8ff8a45dc0213fa109821c (patch) | |
| tree | ac4886a9e36fef3d0d7f621ac46678ebb7486015 /linux | |
| parent | 7d3be8c612e295820649779335288c197b80ccb2 (diff) | |
fix compile issues with external libarries
Diffstat (limited to 'linux')
| -rwxr-xr-x | linux/ws_main.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linux/ws_main.py b/linux/ws_main.py index 6a8967bf..f30a7be3 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/json', +json_src = SrcGroup(dir='external_libs/cpp/json', src_list=[ 'jsoncpp.cpp' ]) @@ -170,7 +170,7 @@ rpc_server_mock = SrcGroups([cmn_src, json_src ]) -yaml_src = SrcGroup(dir='yaml-cpp/src/', +yaml_src = SrcGroup(dir='external_libs/cpp/yaml-cpp/src/', src_list=[ 'aliasmanager.cpp', 'binary.cpp', @@ -221,11 +221,11 @@ cxxflags_base =['-DWIN_UCODE_SIM', includes_path =''' ../src/pal/linux/ - ../src/zmq/include/ ../src/ ../src/rpc-server/include - ../external_libs/json/ - ../yaml-cpp/include/ + ../external_libs/cpp/json/ + ../external_libs/cpp/zmq/include/ + ../external_libs/cpp/yaml-cpp/include/ '''; @@ -349,15 +349,15 @@ build_types = [ build_option(name = "bp-sim", src = bp, debug_mode= DEBUG_, platform = PLATFORM_32, is_pie = False), build_option(name = "bp-sim", src = bp, debug_mode= DEBUG_, platform = PLATFORM_64, is_pie = False), build_option(name = "bp-sim", src = bp, debug_mode= RELEASE_,platform = PLATFORM_32, is_pie = False), - build_option(name = "bp-sim", src = bp, debug_mode= RELEASE_,platform = PLATFORM_64, is_pie = False) + build_option(name = "bp-sim", src = bp, debug_mode= RELEASE_,platform = PLATFORM_64, is_pie = False), - #build_option(name = "mock-rpc-server", use = ['zmq'], src = rpc_server_mock, debug_mode= DEBUG_,platform = PLATFORM_64, is_pie = False), + build_option(name = "mock-rpc-server", use = ['zmq'], src = rpc_server_mock, debug_mode= DEBUG_,platform = PLATFORM_64, is_pie = False), ] 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] ) bld.program(features='cxx cxxprogram', |