Merge "Merge branch 'master' into group-manager" into group-manager

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / SConscript

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index 9b21749..d2a50aa 100755 (executable)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -11,6 +11,7 @@ ca_transport = env.get('TARGET_TRANSPORT')
 secured = env.get('SECURED')
 with_ra = env.get ('WITH_RA')
 with_tcp = env.get('WITH_TCP')
+src_dir = env.get('SRC_DIR')
 root_dir = os.pardir
 ca_path = os.curdir
 
@@ -23,6 +24,7 @@ print"Reading ca script %s"%ca_transport
 env.PrependUnique(CPPPATH = [ os.path.join(root_dir, 'api') ])
 env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'inc'),
                              os.path.join(root_dir, 'lib/libcoap-4.1.1'),
+                             os.path.join(src_dir, '/resource/csdk/logger/include/'),
                              os.path.join(root_dir, 'common/inc') ])
 
 if ca_os not in ['arduino', 'windows', 'winrt']:
@@ -56,13 +58,13 @@ env.AppendUnique(CA_SRC = [os.path.join(ca_path,
                                         'adapter_util/caadapterutils.c')])
 env.AppendUnique(CA_SRC = [os.path.join(ca_path,
                                         'adapter_util/cafragmentation.c')])
+
 if env.get('SECURED') == '1':
        env.AppendUnique(CA_SRC = [os.path.join(ca_path,
                                                 'adapter_util/caadapternetdtls.c')])
        env.AppendUnique(CPPPATH = [os.path.join(root_dir,
                                                  'external/inc')])
 if env.get('DTLS_WITH_X509') == '1':
-       src_dir = env.get('SRC_DIR')
        env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/connectivity/inc/pkix'])
        env.AppendUnique(CPPPATH = [src_dir + '/extlibs/tinydtls/ecc/'])
        env.AppendUnique(CPPPATH = [src_dir + '/extlibs/tinydtls/sha2/'])
@@ -101,7 +103,7 @@ else:
                'caqueueingthread.c',
                'caretransmission.c',
                ]
-       if (('BT' in ca_transport) or ('IP' in ca_transport) or ('ALL' in ca_transport)):
+       if (('IP' in ca_transport) or ('ALL' in ca_transport)):
                env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'cablockwisetransfer.c') ])
                env.AppendUnique(CPPDEFINES = ['WITH_BWT'])
        if secured == '1':
@@ -135,6 +137,11 @@ if 'BLE' in ca_transport:
 if ca_os in ['linux', 'tizen', 'android']:
        if with_tcp == True:
                env.SConscript(os.path.join(ca_path, 'tcp_adapter/SConscript'))
+               env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
+
+if ca_os in ['linux', 'tizen', 'android', 'arduino', 'ios']:
+       if (('BLE' in ca_transport) or ('BT' in ca_transport) or ('ALL' in ca_transport)):
+               env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
 
 print "Include path is %s" % env.get('CPPPATH')
 print "Files path is %s" % env.get('CA_SRC')
@@ -149,4 +156,3 @@ if ca_os in ['android', 'tizen']:
 else:
        calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
 env.InstallTarget(calib, 'libconnectivity_abstraction')
-