Commit 82df6abf authored by George Nash's avatar George Nash Committed by Kishen Maloor

Updates to the Visual Studio Solution

Visual Studio solution changes: (*.vcxproj files)
 - add oc_main.h to Headers
 - add oc_clock_util.h to Headers
 - moved oc_session_events.h from Core to Headers
 - moved oc_signal_event_loop.h from port to Headers
 - add c-timestamp\timestamp.h to Core
 - add timestamp_compare.c, timestamp_format.c, timestamp_parse.c,
       timestamp_tm.c, timestamp_valid.c, and oc_clock.c to the build

This makes it possible to build and use code from oc_clock_util.h without linker errors
Also updates the organization of the files to more closely reflect the project setting.

Change-Id: Iac2f6112bd01a2e4ac98cbf7e56a554f25c3c761
Signed-off-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/29403Tested-by: default avatarIoTivity Jenkins <jenkins-daemon@iotivity.org>
Reviewed-by: Kishen Maloor's avatarKishen Maloor <kishen.maloor@intel.com>
parent a8b67611
......@@ -211,7 +211,9 @@
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\api\c-timestamp\timestamp.h" />
<ClInclude Include="..\..\..\api\oc_events.h" />
<ClInclude Include="..\..\..\api\oc_main.h" />
<ClInclude Include="..\..\..\deps\tinycbor\src\cbor.h" />
<ClInclude Include="..\..\..\deps\tinycbor\src\cborjson.h" />
<ClInclude Include="..\..\..\include\oc_api.h" />
......@@ -220,6 +222,7 @@
<ClInclude Include="..\..\..\include\oc_buffer.h" />
<ClInclude Include="..\..\..\include\oc_buffer_settings.h" />
<ClInclude Include="..\..\..\include\oc_client_state.h" />
<ClInclude Include="..\..\..\include\oc_clock_util.h" />
<ClInclude Include="..\..\..\include\oc_collection.h" />
<ClInclude Include="..\..\..\include\oc_core_res.h" />
<ClInclude Include="..\..\..\include\oc_discovery.h" />
......@@ -278,10 +281,16 @@
<ClInclude Include="..\oc_config.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_compare.c" />
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_format.c" />
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_parse.c" />
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_tm.c" />
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_valid.c" />
<ClCompile Include="..\..\..\api\oc_base64.c" />
<ClCompile Include="..\..\..\api\oc_blockwise.c" />
<ClCompile Include="..\..\..\api\oc_buffer.c" />
<ClCompile Include="..\..\..\api\oc_client_api.c" />
<ClCompile Include="..\..\..\api\oc_clock.c" />
<ClCompile Include="..\..\..\api\oc_collection.c" />
<ClCompile Include="..\..\..\api\oc_core_res.c" />
<ClCompile Include="..\..\..\api\oc_discovery.c" />
......
......@@ -364,6 +364,24 @@
<ClCompile Include="..\..\..\security\oc_obt_otm_randompin.c">
<Filter>Security</Filter>
</ClCompile>
<ClCompile Include="..\..\..\api\oc_clock.c">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_compare.c">
<Filter>Core\c-timestamp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_format.c">
<Filter>Core\c-timestamp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_parse.c">
<Filter>Core\c-timestamp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_tm.c">
<Filter>Core\c-timestamp</Filter>
</ClCompile>
<ClCompile Include="..\..\..\api\c-timestamp\timestamp_valid.c">
<Filter>Core\c-timestamp</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\deps\tinycbor\src\cbor.h">
......@@ -498,18 +516,12 @@
<ClInclude Include="..\..\oc_random.h">
<Filter>Port</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\oc_signal_event_loop.h">
<Filter>Port</Filter>
</ClInclude>
<ClInclude Include="..\..\oc_storage.h">
<Filter>Port</Filter>
</ClInclude>
<ClInclude Include="..\oc_config.h">
<Filter>Port</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\oc_session_events.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\oc_session_state.h">
<Filter>Core</Filter>
</ClInclude>
......@@ -561,6 +573,21 @@
<ClInclude Include="..\..\..\security\oc_csr.h">
<Filter>Security</Filter>
</ClInclude>
<ClInclude Include="..\..\..\api\oc_main.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\oc_clock_util.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\oc_session_events.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\oc_signal_event_loop.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\api\c-timestamp\timestamp.h">
<Filter>Core\c-timestamp</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="mbedTLS">
......@@ -581,5 +608,8 @@
<Filter Include="Security">
<UniqueIdentifier>{c6a27107-4b6c-4673-be9e-c0d8641f0a90}</UniqueIdentifier>
</Filter>
<Filter Include="Core\c-timestamp">
<UniqueIdentifier>{d83c9727-1931-4e51-9774-da03809c6325}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
\ No newline at end of file
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