if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows'] and libocsrm_env.get('SECURED') == '1':
SConscript('provisioning/SConscript')
-if target_os in ['linux'] and libocsrm_env.get('SECURED') == '1':
+if target_os in ['linux', 'windows'] and libocsrm_env.get('SECURED') == '1':
SConscript('tool/SConscript')
tools_env = env.Clone()
src_dir = tools_env.get('SRC_DIR')
+target_os = tools_env.get('TARGET_OS')
######################################################################
# Build flags
tools_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-Wextra', '-std=c++0x'])
tools_env.AppendUnique(LIBPATH = [tools_env.get('BUILD_DIR')])
tools_env.AppendUnique(RPATH = [tools_env.get('BUILD_DIR')])
-tools_env.PrependUnique(LIBS = ['oc', 'octbstack'])
+
+if target_os in ['msys_nt', 'windows']:
+ # octbstack.dll doesn't export all the functions called by this app, so use static LIBs instead.
+ tools_env.AppendUnique(LIBS = ['ws2_32', 'bcrypt', 'iphlpapi',
+ 'coap', 'tinydtls', 'mbedtls', 'mbedx509', 'mbedcrypto',
+ 'octbstack_static', 'ocsrm', 'connectivity_abstraction'])
+else:
+ tools_env.PrependUnique(LIBS = ['oc', 'octbstack'])
######################################################################
# Source files and Targets
#define TAG "JSON2CBOR"
#define MAX_RANGE ((size_t)-1)
//SVR database buffer block size
-static const size_t DB_FILE_SIZE_BLOCK = 1023;
+
+#define DB_FILE_SIZE_BLOCK 1023
static OicSecPstat_t* JSONToPstatBin(const char * jsonStr);
static OicSecDoxm_t* JSONToDoxmBin(const char * jsonStr);
}
cJSON *jsonObj = NULL;
- unsigned char base64Buff[sizeof(((OicUuid_t*)0)->id)] = {};
+ unsigned char base64Buff[sizeof(((OicUuid_t*)0)->id)] = {0};
uint32_t outLen = 0;
B64Result b64Ret = B64_OK;