Merge "scons changes for connectivity-abstraction branch" into connectivity-abstraction

[platform/upstream/iotivity.git] / resource / examples / SConscript

diff --git a/resource/examples/SConscript b/resource/examples/SConscript
index 12a7dcc..c65b4f1 100644 (file)
--- a/resource/examples/SConscript
+++ b/resource/examples/SConscript
@@ -31,7 +31,9 @@ if target_os not in ['windows', 'winrt']:
                examples_env.AppendUnique(LIBS = ['-lpthread'])
 
 examples_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-examples_env.PrependUnique(LIBS = ['oc', 'octbstack', 'coap', 'oc_logger'])
+examples_env.PrependUnique(LIBS = ['oc', 'octbstack', 'coap', 'coap_csdk', 'oc_logger', 'connectivity_abstraction'])
+
+examples_env.ParseConfig('pkg-config --libs glib-2.0');
 
 if target_os == 'android':
        examples_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
@@ -60,13 +62,15 @@ roomserver = examples_env.Program('roomserver', 'roomserver.cpp')
 roomclient = examples_env.Program('roomclient', 'roomclient.cpp')
 garageserver = examples_env.Program('garageserver', 'garageserver.cpp')
 garageclient = examples_env.Program('garageclient', 'garageclient.cpp')
+devicediscoveryserver = examples_env.Program('devicediscoveryserver', 'devicediscoveryserver.cpp')
+devicediscoveryclient = examples_env.Program('devicediscoveryclient', 'devicediscoveryclient.cpp')
 
 Alias("examples", [simpleserver, simpleserverHQ, simpleclient, simpleclientHQ,
                fridgeserver, fridgeclient, presenceserver, presenceclient,
                simpleclientserver, roomserver, roomclient, garageserver,
-               garageclient])
+               garageclient, devicediscoveryserver, devicediscoveryclient])
 env.AppendTarget('examples')
 
 #ios doesn't allow run application from terminal, so won't build these examples
-if target_os != 'ios':
-       SConscript('ocicuc/SConscript')
+#if target_os != 'ios':
+#      SConscript('ocicuc/SConscript')