projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
connectivity
/
common
/
SConscript
diff --git
a/resource/csdk/connectivity/common/SConscript
b/resource/csdk/connectivity/common/SConscript
index
bc75711
..
3cdeef1
100644
(file)
--- a/
resource/csdk/connectivity/common/SConscript
+++ b/
resource/csdk/connectivity/common/SConscript
@@
-7,7
+7,7
@@
Import('env')
print "Reading common folder script"
ca_os = env.get('TARGET_OS')
print "Reading common folder script"
ca_os = env.get('TARGET_OS')
-
+src_dir = env.get('SRC_DIR')
root_dir = './../'
root_dir = './../'
@@
-15,44
+15,27
@@
ca_common_path = root_dir + 'common/'
ca_common_src_path = ca_common_path + 'src/'
env.AppendUnique(CPPPATH = [
ca_common_src_path = ca_common_path + 'src/'
env.AppendUnique(CPPPATH = [
+ '#resource/c_common/octhread/include/',
'common/inc/',
'common/inc/',
+ src_dir + '/resource/csdk/logger/include/',
])
])
-temp = env['CPPPATH']
-header = ' '
-for item in temp:
- header = header + ' -I' + item
-
######################################################################
# Source files and Target(s)
######################################################################
ca_common_src = [
ca_common_src_path + 'uarraylist.c',
######################################################################
# Source files and Target(s)
######################################################################
ca_common_src = [
ca_common_src_path + 'uarraylist.c',
+ ca_common_src_path + 'ulinklist.c',
ca_common_src_path + 'uqueue.c',
ca_common_src_path + 'uqueue.c',
+ ca_common_src_path + 'caremotehandler.c'
]
]
-if ca_os == 'arduino':
- env.Command(env.get('BUILD_DIR') + 'logger.c.o', None, '$CXX -o ' + env.get('BUILD_DIR') + 'logger.c.o' + ' $LINKFLAGS $CCFLAGS $CXXFLAGS ' + '-I' + Dir('.').srcnode().path + '/inc' + header + ' ' + Dir('.').srcnode().path + '/src/logger.c')
- platform_src = [
- env.get('BUILD_DIR') + 'logger.c.o',
- ]
-elif env['POSIX_SUPPORTED']:
+if env['POSIX_SUPPORTED'] or ca_os in ['windows']:
platform_src = [
platform_src = [
- ca_common_src_path + 'logger.c',
- ca_common_src_path + 'oic_logger.c',
- ca_common_src_path + 'oic_console_logger.c',
- ca_common_src_path + 'cathreadpool_pthreads.c',
- ca_common_src_path + 'camutex_pthreads.c'
+ ca_common_src_path + 'cathreadpool_pthreads.c',
]
else:
]
else:
- platform_src = [
- ca_common_src_path + 'logger.c',
- ca_common_src_path + 'oic_logger.c',
- ca_common_src_path + 'oic_console_logger.c'
- ]
-
-
+ platform_src = []
env.AppendUnique(CA_SRC = ca_common_src)
env.AppendUnique(CA_SRC = platform_src)
env.AppendUnique(CA_SRC = ca_common_src)
env.AppendUnique(CA_SRC = platform_src)
-