X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fsrc%2FSConscript;h=df2f209cbb55a2304c4acbaac7467d48ad9630f2;hb=17c68b2fd1e74586f85e552eeab4e32dc121f8a0;hp=621e01c69695f25eb6215d0269fc8083ac4d11ab;hpb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/src/SConscript b/resource/src/SConscript
index 621e01c..df2f209 100644
--- a/resource/src/SConscript
+++ b/resource/src/SConscript
@@ -40,18 +40,26 @@ oclib_env.AppendUnique(CPPPATH = [
 		'../csdk/connectivity/lib/libcoap-4.1.1'
 		])
 
+oclib_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+
+oclib_env.AppendUnique(LIBS = ['octbstack', 'oc_logger'])
+
 target_os = env.get('TARGET_OS')
+if target_os == 'linux':
+	oclib_env.AppendUnique(LIBS = ['pthread'])
+
 if target_os not in ['windows', 'winrt']:
 	oclib_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-fPIC'])
 
+if target_os not in ['darwin', 'ios', 'windows', 'winrt']:
+	oclib_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined'])
+
 if target_os == 'android':
 	oclib_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-	oclib_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-	oclib_env.AppendUnique(LIBS = ['octbstack', 'oc_logger', 'boost_thread', 'gnustl_shared', 'log'])
+	oclib_env.AppendUnique(LIBS = ['boost_thread', 'gnustl_shared', 'log'])
 
-if target_os in ['darwin', 'ios']:
-	oclib_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-	oclib_env.AppendUnique(LIBS = ['octbstack', 'oc_logger'])
+if target_os == 'tizen':
+	oclib_env.AppendUnique(CPPDEFINES = ['__TIZEN__'])
 
 ######################################################################
 # Source files and Targets
@@ -72,3 +80,15 @@ oclib = oclib_env.SharedLibrary('oc', oclib_src)
 oclib_env.InstallTarget(oclib, 'liboc')
 oclib_env.UserInstallTargetLib(oclib, 'liboc')
 
+src_dir = env.get('SRC_DIR')
+
+oclib_env.UserInstallTargetHeader(src_dir + '/resource/include/OCApi.h', 'resource', 'OCApi.h')
+oclib_env.UserInstallTargetHeader(src_dir + '/resource/include/OCPlatform.h', 'resource', 'OCPlatform.h')
+oclib_env.UserInstallTargetHeader(src_dir + '/resource/include/OCRepresentation.h', 'resource', 'OCRepresentation.h')
+oclib_env.UserInstallTargetHeader(src_dir + '/resource/include/OCResource.h', 'resource', 'OCResource.h')
+oclib_env.UserInstallTargetHeader(src_dir + '/resource/include/OCResourceRequest.h', 'resource', 'OCResourceRequest.h')
+oclib_env.UserInstallTargetHeader(src_dir + '/resource/include/OCResourceResponse.h', 'resource', 'OCResourceResponse.h')
+
+# Add Provisioning library
+if target_os in ['linux', 'android'] and env.get('SECURED') == '1':
+        SConscript('../provisioning/SConscript')