Merge branch 'connectivity-abstraction' to master

[platform/upstream/iotivity.git] / service / things-manager / SConscript

diff --git a/service/things-manager/SConscript b/service/things-manager/SConscript
old mode 100644 (file)
new mode 100755 (executable)
index 9e80dcc..15e20bc
--- a/service/things-manager/SConscript
+++ b/service/things-manager/SConscript
@@ -33,7 +33,7 @@ target_os = env.get('TARGET_OS')
 ######################################################################
 # Build flags
 ######################################################################
-things_manager_env.AppendUnique(CPPPATH = ['sdk/inc', 'sdk/src'])
+things_manager_env.AppendUnique(CPPPATH = ['../../extlibs/timer', 'sdk/inc', 'sdk/src'])
 
 if target_os not in ['windows', 'winrt']:
        things_manager_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
@@ -46,7 +46,14 @@ if target_os == 'android':
 ######################################################################
 # Source files and Targets
 ######################################################################
-tgm_src = env.Glob('sdk/src/*.cpp')
+# tgm_src = env.Glob(['sdk/src/*.cpp', '../../extlibs/timer/timer.c'])
+tgm_src = [
+                       'sdk/src/GroupManager.cpp',
+                       'sdk/src/ActionSet.cpp',
+                       'sdk/src/GroupSynchronization.cpp',
+                       'sdk/src/ThingsConfiguration.cpp',
+                       'sdk/src/ThingsDiagnostics.cpp',
+                       'sdk/src/ThingsManager.cpp']
 tgmsdk = things_manager_env.StaticLibrary('TGMSDKLibrary', tgm_src)
 
 things_manager_env.InstallTarget(tgmsdk, 'libTGMSDK')