Skip to content

Commit

Permalink
change to vs2017 v141 and direct set link target libsodium.lib to its…
Browse files Browse the repository at this point in the history
…elf path

note: by this build, you need set mbedtls's Platform Toolset to vs2017 v141 and set mbedtls's Runtime Library to /MT(d)
and also set libsodium's Platform Toolset to vs2017 v141
  • Loading branch information
Akkariiin committed Sep 18, 2017
1 parent 47b17bc commit 0b7691c
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions libsscrypto/libsscrypto.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand All @@ -48,7 +48,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -103,7 +103,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Ws2_32.lib;libsodium.lib;mbedTLS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;$(SolutionDir)\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\static\libsodium.lib;mbedTLS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>libsscrypto.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
Expand All @@ -119,7 +119,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>libsscrypto.def</ModuleDefinitionFile>
<AdditionalDependencies>Ws2_32.lib;libsodium.lib;mbedTLS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;$(SolutionDir)\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\static\libsodium.lib;mbedTLS.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -138,7 +138,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>Ws2_32.lib;libsodium.lib;mbedTLS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;$(SolutionDir)\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\static\libsodium.lib;mbedTLS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>libsscrypto.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
Expand All @@ -158,7 +158,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>libsscrypto.def</ModuleDefinitionFile>
<AdditionalDependencies>Ws2_32.lib;libsodium.lib;mbedTLS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;$(SolutionDir)\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\static\libsodium.lib;mbedTLS.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down

0 comments on commit 0b7691c

Please sign in to comment.