projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Adding Retry logic for LUX disconnection issue" into tizen
[platform/upstream/iotivity.git]
/
service
/
simulator
/
SConscript
diff --git
a/service/simulator/SConscript
b/service/simulator/SConscript
index
260cb0b
..
8a03a54
100755
(executable)
--- a/
service/simulator/SConscript
+++ b/
service/simulator/SConscript
@@
-26,7
+26,8
@@
import os, sys
Import('env')
lib_env = env.Clone()
Import('env')
lib_env = env.Clone()
-SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
+src_dir = env.get('SRC_DIR')
+SConscript(src_dir + '/service/third_party_libs.scons', 'lib_env')
simulator_env = lib_env.Clone()
#Raml Parser
simulator_env = lib_env.Clone()
#Raml Parser
@@
-36,11
+37,11
@@
target_os = env.get('TARGET_OS')
######################################################################
# Build flags
######################################################################
######################################################################
# Build flags
######################################################################
-simulator_env.AppendUnique(CPPPATH = ['inc', 'src/client
-controller', 'src/service-provid
er', 'src/common'])
+simulator_env.AppendUnique(CPPPATH = ['inc', 'src/client
', 'src/serv
er', 'src/common'])
simulator_env.AppendUnique(CPPPATH = [
'../../resource/include/',
'../../resource/csdk/stack/include',
simulator_env.AppendUnique(CPPPATH = [
'../../resource/include/',
'../../resource/csdk/stack/include',
- '../../resource/c
sdk
/ocrandom/include',
+ '../../resource/c
_common
/ocrandom/include',
'../../resource/csdk/logger/include',
'../../resource/oc_logger/include',
'./ramlparser/raml',
'../../resource/csdk/logger/include',
'../../resource/oc_logger/include',
'./ramlparser/raml',
@@
-67,11
+68,13
@@
java_headers.append(os.path.join(java_headers[0], 'linux'))
java_headers.append(os.path.join(java_headers[0], 'solaris'))
simulator_env.AppendUnique(CPPPATH = java_headers)
java_headers.append(os.path.join(java_headers[0], 'solaris'))
simulator_env.AppendUnique(CPPPATH = java_headers)
+simulator_env.Append( RPATH = env.Literal('\\$$ORIGIN'))
+
simulator_env.AppendUnique(CPPPATH = ['../../extlibs/cjson'])
simulator_env.AppendUnique(CPPPATH = ['../../extlibs/cjson'])
-simulator_env.PrependUnique(LIBS = ['oc', 'octbstack', '
oc_logger', 'connectivity_abstraction', 'libcoap','RamlParser','Y
amlParser'])
+simulator_env.PrependUnique(LIBS = ['oc', 'octbstack', '
R
amlParser'])
simulator_env.AppendUnique(LIBS = ['pthread'])
simulator_env.AppendUnique(LIBS = ['pthread'])
-simulator_env.AppendUnique(CXXFLAGS = ['-O2', '-
g', '-
Wall', '-fmessage-length=0', '-std=c++0x'])
+simulator_env.AppendUnique(CXXFLAGS = ['-O2', '-Wall', '-fmessage-length=0', '-std=c++0x'])
######################################################################
# Source files and Targets
######################################################################
# Source files and Targets
@@
-82,8
+85,8
@@
simulator_src = [env.Glob('src/*.cpp')
]
simulatorsdk = simulator_env.SharedLibrary('SimulatorManager', simulator_src)
]
simulatorsdk = simulator_env.SharedLibrary('SimulatorManager', simulator_src)
-simulator_env.InstallTarget(simulatorsdk, 'libSimulator')
+simulator_env.InstallTarget(simulatorsdk, 'libSimulator
Manager
')
#Build sample application
SConscript('examples/server/SConscript')
#Build sample application
SConscript('examples/server/SConscript')
-SConscript('examples/client
-controller
/SConscript')
+SConscript('examples/client/SConscript')