X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fcommon%2FSConscript;h=3cdeef1f542806b8f10d959b8915bfe6309b2478;hb=refs%2Ftags%2Faccepted%2Ftizen%2Funified%2F20171010.063815;hp=d07c6252d204f3b1b852ff483f2d844c29674a3e;hpb=042d312f286334082d9919fbc137f83aa1793d5d;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/connectivity/common/SConscript b/resource/csdk/connectivity/common/SConscript index d07c625..3cdeef1 100644 --- 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') - +src_dir = env.get('SRC_DIR') root_dir = './../' @@ -15,14 +15,11 @@ ca_common_path = root_dir + 'common/' ca_common_src_path = ca_common_path + 'src/' env.AppendUnique(CPPPATH = [ + '#resource/c_common/octhread/include/', '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) ###################################################################### @@ -33,29 +30,12 @@ ca_common_src = [ 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') - logger_src = [ - env.get('BUILD_DIR') + 'logger.c.o', - ] -else: - logger_src = [ - ca_common_src_path + 'logger.c', - ca_common_src_path + 'oic_logger.c', - ca_common_src_path + 'oic_console_logger.c' - ] - -if env['POSIX_SUPPORTED']: +if env['POSIX_SUPPORTED'] or ca_os in ['windows']: platform_src = [ ca_common_src_path + 'cathreadpool_pthreads.c', - ca_common_src_path + 'camutex_pthreads.c' ] else: - platform_src = [ - ca_common_src_path + 'camutex_noop.c' - ] - + platform_src = [] env.AppendUnique(CA_SRC = ca_common_src) -env.AppendUnique(CA_SRC = logger_src) env.AppendUnique(CA_SRC = platform_src)