projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.0.1
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
SConscript
diff --git
a/resource/csdk/SConscript
b/resource/csdk/SConscript
index
df647b8
..
fbbad61
100644
(file)
--- a/
resource/csdk/SConscript
+++ b/
resource/csdk/SConscript
@@
-43,7
+43,6
@@
liboctbstack_env.PrependUnique(CPPPATH = [
'../../extlibs/cjson/',
'../../extlibs/timer/',
'logger/include',
'../../extlibs/cjson/',
'../../extlibs/timer/',
'logger/include',
- 'ocrandom/include',
'stack/include',
'stack/include/internal',
'../oc_logger/include',
'stack/include',
'stack/include/internal',
'../oc_logger/include',
@@
-79,8
+78,8
@@
if target_os in ['android', 'linux', 'tizen']:
liboctbstack_env.AppendUnique(LIBS = ['coap', 'm'])
liboctbstack_env.AppendUnique(LIBS = ['coap', 'm'])
-if target_os
== 'tizen'
:
- liboctbstack_env.ParseConfig("pkg-config --cflags --libs uuid")
+if target_os
in ['tizen', 'linux']
:
+
liboctbstack_env.ParseConfig("pkg-config --cflags --libs uuid")
if target_os not in ['android', 'arduino', 'windows', 'winrt']:
liboctbstack_env.AppendUnique(LIBS = ['pthread'])
if target_os not in ['android', 'arduino', 'windows', 'winrt']:
liboctbstack_env.AppendUnique(LIBS = ['pthread'])
@@
-128,7
+127,6
@@
liboctbstack_src = [
OCTBSTACK_SRC + 'occollection.c',
OCTBSTACK_SRC + 'oicgroup.c',
'logger/src/logger.c',
OCTBSTACK_SRC + 'occollection.c',
OCTBSTACK_SRC + 'oicgroup.c',
'logger/src/logger.c',
- 'ocrandom/src/ocrandom.c',
OCTBSTACK_SRC + "rdpayload.c"
]
OCTBSTACK_SRC + "rdpayload.c"
]