Commit 009b2015 authored by George Nash's avatar George Nash

Update build scripts and include headers

update include paths for ocrandom and logger

Change-Id: I1aa7b109db5bbe8bd4ee54109e6dbaadeb58fb7a
Signed-off-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
parent 4a6a779d
......@@ -67,16 +67,22 @@ else:
env.AppendUnique(CCFLAGS = ['-Os'])
env.AppendUnique(CPPDEFINES = ['NDEBUG'])
# currently this build script only supports linux build as we add other target OSs
# target_os will need to be replaced buy actual OSs
target_os = 'linux'
iotivity_service_inc_paths = ['${IOTIVITY_BASE}/service/resource-container/include',
'${IOTIVITY_BASE}/service/resource-container/bundle-api/include',
'${IOTIVITY_BASE}/service/resource-container/src',
'${IOTIVITY_BASE}/service/resource-encapsulation/include']
iotivity_resource_inc_paths = ['${IOTIVITY_BASE}/resource/oc_logger/include',
'${IOTIVITY_BASE}/resource/csdk/stack/include',
'${IOTIVITY_BASE}/resource/csdk/include',
'${IOTIVITY_BASE}/resource/c_common',
'${IOTIVITY_BASE}/resource/include',
'${IOTIVITY_BASE}/resource/c_common/ocrandom/include']
iotivity_resource_inc_paths = ['${IOTIVITY_BASE}/out/' + target_os + '/${TARGET_ARCH}/${IOTIVITY_LIB_TYPE}/resource/c_common',
'${IOTIVITY_BASE}/resource/oc_logger/include',
'${IOTIVITY_BASE}/resource/csdk/stack/include',
'${IOTIVITY_BASE}/resource/csdk/include',
'${IOTIVITY_BASE}/resource/c_common',
'${IOTIVITY_BASE}/resource/include',
'${IOTIVITY_BASE}/resource/c_common/ocrandom/include',
]
env['CPPPATH'] = ['${IOTIVITY_BASE}/extlibs']
env.AppendUnique(CPPPATH = iotivity_service_inc_paths)
......@@ -95,10 +101,6 @@ env.AppendUnique(CPPPATH = ['/usr/include/glib-2.0',
env.AppendUnique(CPPPATH = ['#/include/'])
# currently this build script only supports linux build as we add other target OSs
# target_os will need to be replaced buy actual OSs
target_os = 'linux'
env.Replace(BUILD_DIR = 'out/' + target_os + '/${TARGET_ARCH}/${BUILD_TYPE}' )
# UPnP libraries
......
......@@ -20,7 +20,7 @@
#include <iostream>
#include <ocrandom.h>
#include <experimental/ocrandom.h>
#include <ocstack.h>
#include <octypes.h>
#include <oic_string.h>
......
......@@ -27,7 +27,7 @@
#include <set>
#include <assert.h>
#include <pluginServer.h>
#include "logger.h"
#include "experimental/logger.h"
#include "UpnpConnector.h"
#include "UpnpResource.h"
#include "UpnpBridgeDevice.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment