[IOT-1779] Windows: fix linker errors for SECURED=0

The recently-added octbstack.dll exports from octbstack_product_with_tcp
were actually not available when SECURED=0.

Also, move the larger SConscript if/else paths to the 'else' branch,
for easier reading of these two nested if/else statements.

Change-Id: I66821e51c2beef2f2fbad2755a5f361ba836d892
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16807
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index 088f2f5..8b6f2b1 100644 (file)
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -107,27 +107,27 @@ if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows']:
                if with_ra:
                        liboctbstack_env.AppendUnique(LIBS = ['ra_xmpp'])
 
-if target_os in ['windows', 'msys_nt']:
+if target_os not in ['windows', 'msys_nt']:
+       liboctbstack_env.AppendUnique(LIBS = ['m'])
+else:
        # octbstack.def specifies the list of functions exported by octbstack.dll.
        liboctbstack_env.Replace(WINDOWS_INSERT_DEF = ['1'])
 
-       if with_tcp == True:
-               liboctbstack_env.Textfile(target = 'octbstack_temp.def', source = [File('octbstack_product.def'), File('octbstack_product_with_tcp.def')])
+       if env.get('SECURED') != '1':
+               liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_product.def')])
        else:
-               liboctbstack_env.Textfile(target = 'octbstack_temp.def', source = [File('octbstack_product.def')])
-
-       if env.get('SECURED') == '1':
                # octbstack.dll is exporting ocpmapi APIs on Windows - there is no ocpmapi.dll.
                liboctbstack_env.PrependUnique(LIBS = ['ocpmapi'])
 
+               if with_tcp == True:
+                       liboctbstack_env.Textfile(target = 'octbstack_temp.def', source = [File('octbstack_product.def'), File('octbstack_product_with_tcp.def')])
+               else:
+                       liboctbstack_env.Textfile(target = 'octbstack_temp.def', source = [File('octbstack_product.def')])
+
                if env.get('MULTIPLE_OWNER') == '1':
                        liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_temp.def'), File('octbstack_product_secured.def'), File('octbstack_product_secured_mot.def')])
                else:
                        liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_temp.def'), File('octbstack_product_secured.def')])
-       else:
-               liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_temp.def')])
-else:
-       liboctbstack_env.AppendUnique(LIBS = ['m'])
 
 if target_os in ['tizen', 'linux']:
        liboctbstack_env.ParseConfig("pkg-config --cflags --libs uuid")