Commit ce1a6187 authored by Gabriel Schulhof's avatar Gabriel Schulhof Committed by Randeep

Build json2cbor on OSX

Change-Id: I5858833c85a76bc4acaab1b6393f0feda28284b7
Signed-off-by: default avatarGabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14259Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: default avatarDan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: default avatarPhil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep's avatarRandeep Singh <randeep.s@samsung.com>
parent 47c929a8
......@@ -144,5 +144,5 @@ libocsrm_env.InstallTarget(libocsrm, 'ocsrm')
if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows'] and libocsrm_env.get('SECURED') == '1':
SConscript('provisioning/SConscript')
if target_os in ['linux', 'windows'] and libocsrm_env.get('SECURED') == '1':
if target_os in ['linux', 'windows', 'darwin'] and libocsrm_env.get('SECURED') == '1':
SConscript('tool/SConscript')
......@@ -54,6 +54,9 @@ if target_os in ['msys_nt', 'windows']:
tools_env.AppendUnique(LIBS = ['ws2_32', 'bcrypt', 'iphlpapi',
'coap', 'tinydtls', 'mbedtls', 'mbedx509', 'mbedcrypto',
'octbstack_static', 'ocsrm', 'connectivity_abstraction'])
elif target_os in ['darwin']:
tools_env.AppendUnique(LIBS = ['coap', 'tinydtls', 'mbedtls', 'mbedx509', 'mbedcrypto',
'octbstack', 'ocsrm', 'connectivity_abstraction'])
else:
tools_env.PrependUnique(LIBS = ['oc', 'octbstack'])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment