X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Feasy-setup%2Fsampleapp%2Fenrollee%2Ftizen-sdb%2FEnrolleeSample%2FSConscript;h=75e55b8711672f90a1f6a8d28fb13aeacf3e93a4;hb=3c093548382bb2542c87a67e6e5fa32552c29cb3;hp=0cd828854485c289797281a200be3c46472aab16;hpb=dbdccd21aa801bdf33b6277f17387b2dda7eb50a;p=platform%2Fupstream%2Fiotivity.git diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript index 0cd8288..75e55b8 100644 --- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript +++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript @@ -29,7 +29,7 @@ print "Inside the Config SConscript" # Map of host os and allowed target os (host: allowed target os) host_target_map = { 'linux': ['linux', 'android', 'arduino', 'yocto', 'tizen'], - 'windows': ['windows', 'winrt', 'android', 'arduino', 'tizen'], + 'windows': ['windows', 'android', 'arduino', 'tizen'], 'darwin': ['darwin', 'ios', 'android', 'arduino'], } @@ -38,7 +38,6 @@ os_arch_map = { 'linux': ['x86', 'x86_64', 'arm', 'arm64'], 'android': ['x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'armeabi-v7a-hard', 'arm64-v8a'], 'windows': ['x86', 'amd64', 'arm'], - 'winrt': ['arm'], 'darwin': ['i386', 'x86_64'], 'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'], 'arduino': ['avr', 'arm'], @@ -78,6 +77,13 @@ help_vars.Add(EnumVariable('TARGET_ARCH', 'Target architecture', default_arch, o help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '0', allowed_values=('0', '1'))) help_vars.Add(EnumVariable('ROUTING', 'Enable routing', 'EP', allowed_values=('GW', 'EP'))) +AddOption('--prefix', + dest='prefix', + type='string', + nargs=1, + action='store', + metavar='DIR', + help='installation prefix') ###################################################################### # Platform(build target) specific options: SDK/NDK & toolchain ###################################################################### @@ -193,10 +199,6 @@ env.SetDir(env.GetLaunchDir()) env['ROOT_DIR']=env.GetLaunchDir() env.AppendUnique(CPPDEFINES = ['TB_LOG']) -if env.get('ROUTING') == 'GW': - env.AppendUnique(CPPDEFINES = ['ROUTING_GATEWAY']) -elif env.get('ROUTING') == 'EP': - env.AppendUnique(CPPDEFINES = ['ROUTING_EP']) env.AppendUnique(CPPDEFINES = ['__TIZEN__']) Export('env')