aboutsummaryrefslogtreecommitdiff
path: root/src/tss2-mu
diff options
context:
space:
mode:
authorDavid J. Maria <davidjmaria@fb.com>2018-06-19 14:52:37 -0700
committerTadeusz Struk <tadeusz.struk@intel.com>2018-07-03 12:18:08 -0700
commit06db575c3c0d3deded7e2e1d6322e719101d94df (patch)
tree9b5edc12a6adb79c64b65c50a5c2083b4c0f16ca /src/tss2-mu
parent4b4c95817666cf7f6dc1dba8dd0af174af09df48 (diff)
downloadtpm2-tss-06db575c3c0d3deded7e2e1d6322e719101d94df.tar.gz
tcti: Port sumulator TCTI to Windows
Add conditional inclusion directives to separate POSIX and Windows specific code. Replace hard coded -1 values with SOCKET_ERROR and INVALID_SOCKET. Add Visual Studio solution for Simulator TCTI Add .def file for building the Simulator TCTI dll Rewrite the TEMP_RETRY macro. Previously this macro was a stement expression; statement expressions are part of the non-standard gcc extension statement-exprs. When compiling on Windows: - Initialize winsock - Replace errno with WSAGetLastError() - Replace "read" with "recv" - Replace "write" with "send" - Replace "close" with "closesocket" - Set _HOST_NAME_MAX to MAX_COMPUTERNAME_LENGTH instead of _POSIX_HOST_NAME_MAX - Map strtok_r to strtok_s Fixes #671, #672 Signed-off-by: David Maria <davidjmaria@fb.com>
Diffstat (limited to 'src/tss2-mu')
-rw-r--r--src/tss2-mu/tss2-mu.vcxproj10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tss2-mu/tss2-mu.vcxproj b/src/tss2-mu/tss2-mu.vcxproj
index f67897cc..7b159f2f 100644
--- a/src/tss2-mu/tss2-mu.vcxproj
+++ b/src/tss2-mu/tss2-mu.vcxproj
@@ -43,22 +43,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v141_clang_c2</PlatformToolset>
+ <PlatformToolset>LLVM-vs2014</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v141_clang_c2</PlatformToolset>
+ <PlatformToolset>LLVM-vs2014</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v141_clang_c2</PlatformToolset>
+ <PlatformToolset>LLVM-vs2014</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v141_clang_c2</PlatformToolset>
+ <PlatformToolset>LLVM-vs2014</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
@@ -85,4 +85,4 @@
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project> \ No newline at end of file