Use /NODEFAULTLIB on Windows.
The Rust toolchain chooses which Windows libraries to link. Avoid potential conflicts by avoiding specifying our own preferences.
This commit is contained in:
parent
6b23a8c5ba
commit
48fb95e560
@ -18,7 +18,6 @@
|
||||
<ClCompile Include="cpu-intel.c" />
|
||||
<ClCompile Include="crypto.c" />
|
||||
<ClCompile Include="thread_win.c" />
|
||||
|
||||
<ClCompile Include="aes\aes.c" />
|
||||
<ClCompile Include="bn\add.c" />
|
||||
<ClCompile Include="bn\bn.c" />
|
||||
@ -74,7 +73,6 @@
|
||||
<ClInclude Include="rand\internal.h" />
|
||||
<ClInclude Include="rsa\internal.h" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(ProcessorArchitecture)' == 'x86'">
|
||||
<PerlAsm Include="aes/asm/aes-586.pl" />
|
||||
<PerlAsm Include="aes/asm/aesni-x86.pl" />
|
||||
@ -101,7 +99,6 @@
|
||||
</AdditionalDependencies>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<ItemGroup Condition="'$(ProcessorArchitecture)' == 'amd64'">
|
||||
<PerlAsm Include="aes/asm/aes-x86_64.pl" />
|
||||
<PerlAsm Include="aes/asm/aesni-x86_64.pl" />
|
||||
@ -145,16 +142,14 @@
|
||||
</AdditionalDependencies>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\include;$(GENERATED_CODE_DIR)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\mk\perlasm-msbuild.targets" />
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
@ -70,6 +70,9 @@
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
|
||||
</Lib>
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
2
ring.sln
2
ring.sln
@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.23107.0
|
||||
VisualStudioVersion = 14.0.25123.0
|
||||
MinimumVisualStudioVersion = 12.0.21005.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libring.Windows", "crypto\libring.Windows.vcxproj", "{F4C0A1B6-5E09-41C8-8242-3E1F6762FB18}"
|
||||
EndProject
|
||||
|
Loading…
x
Reference in New Issue
Block a user