Merge branch 'master' into extended-easysetup

[platform/upstream/iotivity.git] / resource / csdk / security / provisioning / SConscript

diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript
index 65d7855..2fea369 100644 (file)
--- a/resource/csdk/security/provisioning/SConscript
+++ b/resource/csdk/security/provisioning/SConscript
@@ -30,16 +30,16 @@ root_dir = './../../../../'
 provisioning_env.AppendUnique(CPPPATH = [
                '../../stack/include',
                '../../stack/include/internal',
-               '../../ocrandom/include',
+               '../../../c_common/ocrandom/include',
                '../../logger/include',
                '../../../oc_logger/include',
-               '../../ocmalloc/include',
+               '../../../c_common/oic_malloc/include',
                'include',
                'include/internal',
                'include/oxm',
                '../../resource/csdk/security/include',
                '../../../../extlibs/cjson/',
-               '../../../../../extlibs/tinydtls/',
+               '../../../../extlibs/tinydtls/',
                '../../connectivity/inc',
                '../../connectivity/external/inc',
                '../../connectivity/common/inc',
@@ -47,23 +47,26 @@ provisioning_env.AppendUnique(CPPPATH = [
                '../../connectivity/api',
                '../include',
                '../include/internal',
-               '../../../../extlibs/sqlite3',
-               '../../../../extlibs/tinydtls/ecc',
-               '../../../../extlibs/tinydtls/sha2',
-               '../../../../extlibs/asn1cert',
+               '../../../../extlibs/tinydtls/ecc',
+               '../../../../extlibs/tinydtls/sha2',
+               '../../../../extlibs/asn1cert',
                'ck_manager/include'
                ])
 target_os = env.get('TARGET_OS')
-provisioning_env.AppendUnique(CFLAGS = ['-D__WITH_DTLS__'])
-provisioning_env.AppendUnique(CFLAGS = ['-std=c99'])
-if target_os not in ['windows', 'winrt']:
-       provisioning_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread', '-D__WITH_DTLS__'])
+
+if target_os != 'tizen':
+       provisioning_env.AppendUnique(CPPPATH = ['../../../../extlibs/sqlite3'])
+
+provisioning_env.AppendUnique(CPPDEFINES= ['__WITH_DTLS__'])
+if target_os not in ['windows']:
+       provisioning_env.AppendUnique(CFLAGS = ['-std=c99'])
+if target_os not in ['windows', 'msys_nt']:
+       provisioning_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
 
        # Note: 'pthread' is in libc for android. On other platform, if use
        # new gcc(>4.9?) it isn't required, otherwise, it's required
        if target_os != 'android':
-               provisioning_env.AppendUnique(LIBS = ['-lpthread'])
-
+               provisioning_env.AppendUnique(LIBS = ['-lpthread', '-ldl'])
 
 provisioning_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 provisioning_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap'])
@@ -71,16 +74,23 @@ provisioning_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connecti
 provisioning_env.AppendUnique(LIBS = ['tinydtls'])
 
 if env.get('DTLS_WITH_X509') == '1':
-       provisioning_env.AppendUnique(LIBS = ['CKManger'])
+       provisioning_env.AppendUnique(LIBS = ['CKManager', 'asn1'])
+
+if target_os not in ['msys_nt', 'windows', 'android']:
+       provisioning_env.ParseConfig('pkg-config --libs glib-2.0')
 
-provisioning_env.ParseConfig('pkg-config --libs glib-2.0');
+if target_os in ['windows', 'msys_nt']:
+       provisioning_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi', 'timer'])
+
+if target_os == 'tizen':
+       provisioning_env.ParseConfig('pkg-config --cflags --libs sqlite3')
 
 if target_os == 'android':
        provisioning_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
        provisioning_env.AppendUnique(LIBS = ['gnustl_static'])
 
        if not env.get('RELEASE'):
-               provisioning_env.AppendUnique(LIBS = ['log'])
+               provisioning_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 if target_os in ['darwin', 'ios']:
        provisioning_env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE'])
@@ -96,16 +106,23 @@ provisioning_src = [
        'src/ocprovisioningmanager.c',
        'src/oxmjustworks.c',
        'src/oxmrandompin.c',
-       'src/provisioningdatabasemanager.c',
-       root_dir+'/extlibs/sqlite3/sqlite3.c' ]
-provisioningserver = provisioning_env.StaticLibrary('ocpmapi', provisioning_src)
+       'src/provisioningdatabasemanager.c' ]
+
+if target_os != 'tizen':
+       provisioning_src = provisioning_src + [root_dir+'/extlibs/sqlite3/sqlite3.c' ]
+
+if target_os == 'windows':
+       # TODO: Add OC_EXPORT annotations and enable generation of Windows DLL
+       provisioningserver = provisioning_env.StaticLibrary('ocpmapi', provisioning_src)
+else:
+       provisioningserver = provisioning_env.SharedLibrary('ocpmapi', provisioning_src)
 
-provisioning_env.InstallTarget(provisioningserver, 'libocpmapi')
-provisioning_env.UserInstallTargetLib(provisioningserver, 'libocpmapi')
+provisioning_env.InstallTarget(provisioningserver, 'ocpmapi')
+provisioning_env.UserInstallTargetLib(provisioningserver, 'ocpmapi')
 
 if env.get('DTLS_WITH_X509') == '1':
        SConscript('ck_manager/SConscript')
 
-if target_os in ['linux']:
+if target_os in ['linux', 'msys_nt', 'windows']:
        SConscript('sample/SConscript')