X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2FSConscript;h=f12a87a855d4279de8596d1b3d3fba0a8b7cd96e;hb=a6423190ad34f213e19237b1f24b2c1ff751707d;hp=8fbbfae36d4daa9e8bf1966954d46246211ac781;hpb=3946fca0bafa9a3657a3b6651288e6aabe7717d0;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index 8fbbfae..f12a87a 100644
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -94,15 +94,16 @@ liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 
 liboctbstack_env.PrependUnique(LIBS = ['ocsrm', 'coap'])
 
+if target_os in ['tizen']:
+    liboctbstack_env.AppendUnique(LIBS = ['pthread'])
+
 if target_os in ['linux'] and liboctbstack_env.get('SIMULATOR', False):
-    liboctbstack_env.Append( RPATH = liboctbstack_env.Literal('\\$$ORIGIN'))
+	liboctbstack_env.Append( RPATH = liboctbstack_env.Literal('\\$$ORIGIN'))
 
 if env.get('SECURED') == '1':
-	liboctbstack_env.AppendUnique(LIBS = ['tinydtls'])
-	if env.get('WITH_TCP') == True:
-		liboctbstack_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
+	liboctbstack_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
 
-if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows']:
+if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows', 'tizenrt']:
 	liboctbstack_env.PrependUnique(LIBS = ['connectivity_abstraction'])
 
 	if with_ra_ibb:
@@ -122,11 +123,14 @@ if target_os in ['windows', 'msys_nt']:
 	if env.get('SECURED') == '1':
 		# octbstack.dll is exporting ocpmapi APIs on Windows - there is no ocpmapi.dll.
 		liboctbstack_env.PrependUnique(LIBS = ['ocpmapi'])
-		liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_not_secured.def'), File('octbstack_product_secured.def')])
+		if env.get('MULTIPLE_OWNER') == '1':
+			liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_not_secured.def'), File('octbstack_product_secured.def'), File('octbstack_product_secured_mot.def')])
+		else:
+			liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_not_secured.def'), File('octbstack_product_secured.def')])
 	else:
 		liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_not_secured.def')])
 
-	liboctbstack_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi'])
+	liboctbstack_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi', 'bcrypt'])
 else:
 	liboctbstack_env.AppendUnique(LIBS = ['m'])
 
@@ -146,25 +150,31 @@ if target_os in ['darwin', 'ios']:
 if target_os not in ['arduino', 'windows']:
 	liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined'])
 if target_os == 'android':
-    liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,liboctbstack.so'])
+	liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,liboctbstack.so'])
 
 if env.get('LOGGING'):
 	liboctbstack_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
-if env.get('DTLS_WITH_X509') == '1':
-	liboctbstack_env.AppendUnique(CPPDEFINES = ['__WITH_X509__'])
-
 liboctbstack_env.Append(LIBS = ['c_common'])
 
 if liboctbstack_env.get('ROUTING') in ['GW', 'EP']:
 	liboctbstack_env.Prepend(LIBS = ['routingmanager'])
 
+if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
+    if 'CLIENT' in rd_mode:
+        liboctbstack_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
+    if 'SERVER' in rd_mode:
+        liboctbstack_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])
+        if target_os in ['tizen']:
+            liboctbstack_env.ParseConfig('pkg-config --cflags --libs sqlite3')
+        else:
+            liboctbstack_env.AppendUnique(CPPPATH = ['#extlibs/sqlite3'])
+
 ######################################################################
 # Source files and Targets
 ######################################################################
 OCTBSTACK_SRC = 'stack/src/'
 liboctbstack_src = [
-	'../../extlibs/cjson/cJSON.c',
 	'../../extlibs/timer/timer.c',
 	OCTBSTACK_SRC + 'ocstack.c',
 	OCTBSTACK_SRC + 'ocpayload.c',
@@ -178,16 +188,27 @@ liboctbstack_src = [
 	OCTBSTACK_SRC + 'oicgroup.c'
 	]
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-	liboctbstack_src.append(OCTBSTACK_SRC + 'rdpayload.c')
-	liboctbstack_src.append(OCTBSTACK_SRC + 'oicresourcedirectory.c')
-	if 'CLIENT' in rd_mode:
-		liboctbstack_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
-	if 'SERVER' in rd_mode:
-		liboctbstack_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])
+if target_os != 'tizenrt':
+        liboctbstack_src.append('../../extlibs/cjson/cJSON.c')
 
 if with_tcp == True:
 	liboctbstack_src.append(OCTBSTACK_SRC + 'oickeepalive.c')
+	liboctbstack_env.UserInstallTargetHeader('stack/include/oickeepalive.h', 'resource', 'oickeepalive.h')
+
+if 'SERVER' in rd_mode:
+    liboctbstack_src.append(OCTBSTACK_SRC + 'oicresourcedirectory.c')
+    if target_os not in ['tizen']:
+        liboctbstack_src.append('#extlibs/sqlite3/sqlite3.c')
+
+if target_os in ['linux']:
+    # Linux uses a Shared library because SCons chooses the shared library on Linux
+    # when only 'octbstack' is added to the LIBS.
+    # TODO: Switch Linux to use a Static library for testing like every other OS.
+    test_liboctbstack = liboctbstack_env.SharedLibrary('octbstack_test', liboctbstack_src)
+else:
+    test_liboctbstack = liboctbstack_env.StaticLibrary('octbstack_test', liboctbstack_src)
+
+octbstack_libs = Flatten(test_liboctbstack)
 
 if target_os in ['windows', 'msys_nt']:
 	# Avoid a name conflict with the octbstack.lib target of the SharedLibrary.
@@ -197,7 +218,7 @@ else:
 
 octbstack_libs = Flatten(static_liboctbstack)
 
-if target_os not in ['arduino','darwin','ios'] :
+if target_os not in ['arduino','darwin','ios','tizenrt'] :
 	shared_liboctbstack = liboctbstack_env.SharedLibrary('octbstack', liboctbstack_src)
 	octbstack_libs += Flatten(shared_liboctbstack)
 	liboctbstack_env.UserInstallTargetHeader('stack/include/ocstack.h', 'resource', 'ocstack.h')