Merge branch 'upstream' into tizen

[platform/upstream/iotivity.git] / resource / csdk / connectivity / lib / libcoap-4.1.1 / SConscript

diff --git a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript
index 876bc03..0683773 100644 (file)
--- a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript
+++ b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript
@@ -37,12 +37,14 @@ if target_os not in ['windows', 'winrt']:
        libcoap_env.AppendUnique(CFLAGS = ['-Wall', '-ffunction-sections',
                        '-fdata-sections', '-fno-exceptions'])
 
-if target_os in ['linux', 'tizen']:
+if target_os in ['linux', 'tizen', 'android', 'ios']:
        if with_tcp == True:
                libcoap_env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
 
-if target_os == 'android':
+if target_os in ['linux', 'tizen', 'android', 'arduino']:
        libcoap_env.AppendUnique(LIBS = ['log'])
+       if (('BLE' in ca_transport) or ('BT' in ca_transport) or ('ALL' in ca_transport)):
+               libcoap_env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
 
 if target_os == 'arduino':
        libcoap_env.AppendUnique(CPPDEFINES = ['NDEBUG', 'WITH_ARDUINO'])