X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Feasy-setup%2Fenrollee%2FSConscript;h=b2401f2c960316e63fa2b8b7bdc8f384ff62cadf;hb=3c093548382bb2542c87a67e6e5fa32552c29cb3;hp=c74000081f75828c0c55e017d043834b06f0b04c;hpb=edcfc3d2329da7b914771c0dcff5f42c9b74fd93;p=platform%2Fupstream%2Fiotivity.git diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript index c740000..b2401f2 100644 --- a/service/easy-setup/enrollee/SConscript +++ b/service/easy-setup/enrollee/SConscript @@ -50,9 +50,10 @@ enrollee_env.PrependUnique(CPPPATH = [ enrollee_env.get('SRC_DIR') + '/extlibs/cjson', enrollee_env.get('SRC_DIR') + '/service/easy-setup/inc', enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/inc', - enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src']) - -if target_os not in ['linux', 'tizen']: + enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src', + enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/inc/samsung', + enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/samsung']) +if target_os not in ['tizen']: enrollee_env.PrependUnique(CPPPATH = [ enrollee_env.get('SRC_DIR') + '/extlibs/sqlite3']) @@ -105,7 +106,7 @@ if target_os == 'arduino': es_enrollee_src = None if target_os in ['linux', 'tizen']: - es_enrollee_common_src = ['./src/easysetup.c','./src/resourcehandler.c'] + es_enrollee_common_src = ['./src/easysetup.c','./src/resourcehandler.c', './src/samsung/sc_easysetup.c'] enrollee_sdk_shared = enrollee_env.SharedLibrary('ESEnrolleeSDK', es_enrollee_common_src) enrollee_sdk_static = enrollee_env.StaticLibrary('ESEnrolleeSDK', es_enrollee_common_src) enrollee_env.InstallTarget([enrollee_sdk_shared, enrollee_sdk_static], 'libESEnrollee') @@ -123,9 +124,10 @@ if target_os == 'arduino': #if target_os == 'arduino': # SConscript('../sampleapp/enrollee/arduino/SConscript') -if target_os in ['linux']: - SConscript('../sampleapp/enrollee/linux/SConscript') - #Build UnitTestcases for Enrollee - if enrollee_env.get('SECURED') == '0': - SConscript('../enrollee/unittests/SConscript') +#if target_os in ['linux']: +# SConscript('../sampleapp/enrollee/linux/SConscript') +# SConscript('../sampleapp/enrollee/linux-samsung/SConscript') +# #Build UnitTestcases for Enrollee +# if enrollee_env.get('SECURED') == '0': +# SConscript('../enrollee/unittests/SConscript')