Merge branch 'master' into notification-service

[platform/upstream/iotivity.git] / service / simulator / SConscript

diff --git a/service/simulator/SConscript b/service/simulator/SConscript
index 2f262a5..8a03a54 100755 (executable)
--- a/service/simulator/SConscript
+++ b/service/simulator/SConscript
@@ -26,7 +26,8 @@ import os, sys
 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
@@ -67,8 +68,10 @@ 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)
 
+simulator_env.Append( RPATH = env.Literal('\\$$ORIGIN'))
+
 simulator_env.AppendUnique(CPPPATH = ['../../extlibs/cjson'])
-simulator_env.PrependUnique(LIBS = ['octbstack', 'oc', 'RamlParser'])
+simulator_env.PrependUnique(LIBS = ['oc', 'octbstack', 'RamlParser'])
 simulator_env.AppendUnique(LIBS = ['pthread'])
 
 simulator_env.AppendUnique(CXXFLAGS = ['-O2', '-Wall', '-fmessage-length=0', '-std=c++0x'])
@@ -82,7 +85,7 @@ simulator_src = [env.Glob('src/*.cpp')
                 ]
 simulatorsdk = simulator_env.SharedLibrary('SimulatorManager', simulator_src)
 
-simulator_env.InstallTarget(simulatorsdk, 'libSimulator')
+simulator_env.InstallTarget(simulatorsdk, 'libSimulatorManager')
 
 #Build sample application
 SConscript('examples/server/SConscript')