[IOT-1878] Windows: Fix build breaks

Don't try to link with both:
    1. Static lib ocsrm.lib
    2. Import lib octbstack.lib
because octbstack.lib provides references to the copy of ocsrm.lib
that is linked inside octbstack.dll.

Change-Id: I91ec755a58f9fbdf6d203daa3b9ad2cc7ada7988
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17657
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>

diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript
index e94325f..eeca319 100644 (file)
--- a/resource/csdk/security/provisioning/SConscript
+++ b/resource/csdk/security/provisioning/SConscript
@@ -46,7 +46,11 @@ if 'g++' in provisioning_env.get('CXX'):
     provisioning_env.AppendUnique(CXXFLAGS = ['-std=c++0x'])
 
 provisioning_env.AppendUnique(LIBPATH = [provisioning_env.get('BUILD_DIR')])
-provisioning_env.PrependUnique(LIBS = ['octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', 'ocsrm'])
+provisioning_env.PrependUnique(LIBS = ['octbstack', 'oc_logger', 'connectivity_abstraction', 'coap'])
+
+if target_os not in ['msys_nt', 'windows']:
+       # octbstack.dll is exporting ocpmapi and ocsrm APIs on Windows.
+       provisioning_env.PrependUnique(LIBS = ['ocsrm'])
 
 provisioning_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509','mbedcrypto'])
 

diff --git a/resource/csdk/stack/octbstack_product_secured.def b/resource/csdk/stack/octbstack_product_secured.def
index f52c77f..642856d 100644 (file)
--- a/resource/csdk/stack/octbstack_product_secured.def
+++ b/resource/csdk/stack/octbstack_product_secured.def
@@ -46,6 +46,7 @@ OCSetOwnerTransferCallbackData
 OCUnlinkDevices
 OCSetOxmAllowStatus
 
+SetClosePinDisplayCB
 SetDisplayPinWithContextCB
 UnsetDisplayPinWithContextCB
 SetDeviceIdSeed