hush
/
libsodium
8
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

Update Makefiles and MSVC solutions

next
Frank Denis 8 years ago
parent
64fe1b2353
commit
4b6667a9d3
9 changed files with 34 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      builds/msvc/vs2010/libsodium/libsodium.vcxproj
  2. 11
      builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
  3. 5
      builds/msvc/vs2012/libsodium/libsodium.vcxproj
  4. 7
      builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
  5. 5
      builds/msvc/vs2013/libsodium/libsodium.vcxproj
  6. 7
      builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
  7. 5
      builds/msvc/vs2015/libsodium/libsodium.vcxproj
  8. 7
      builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
  9. 1
      src/libsodium/Makefile.am

5
builds/msvc/vs2010/libsodium/libsodium.vcxproj
View File

@ -72,6 +72,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-avx2.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ssse3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.c" />
@ -94,7 +95,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-avx2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna32.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna64.h" />
@ -274,4 +275,4 @@
<Xml Include="..\..\..\..\packaging\nuget\package.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>

11
builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
View File

@ -289,9 +289,6 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h">
<Filter>src\crypto_stream\chacha20\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.h">
<Filter>src\crypto_onetimeauth\poly1305</Filter>
</ClInclude>
@ -301,6 +298,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-avx2.h">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.h">
<Filter>src\crypto_scalarmult\curve25519\donna_c64</Filter>
</ClInclude>
@ -799,6 +799,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-avx2.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
@ -857,4 +860,4 @@
<Filter>src\crypto_pwhash\argon2</Filter>
</ClCompile>
</ItemGroup>
</Project>
</Project>

5
builds/msvc/vs2012/libsodium/libsodium.vcxproj
View File

@ -72,6 +72,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-avx2.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ssse3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.c" />
@ -94,7 +95,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-avx2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna32.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna64.h" />
@ -274,4 +275,4 @@
<Xml Include="..\..\..\..\packaging\nuget\package.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>

7
builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
View File

@ -295,7 +295,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h">
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-avx2.h">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.h">
@ -799,6 +799,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-avx2.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
@ -857,4 +860,4 @@
<Filter>src\crypto_core\hchacha20</Filter>
</ClCompile>
</ItemGroup>
</Project>
</Project>

5
builds/msvc/vs2013/libsodium/libsodium.vcxproj
View File

@ -72,6 +72,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-avx2.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ssse3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.c" />
@ -94,7 +95,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-avx2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna32.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna64.h" />
@ -274,4 +275,4 @@
<Xml Include="..\..\..\..\packaging\nuget\package.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>

7
builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
View File

@ -295,7 +295,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h">
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-avx2.h">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.h">
@ -799,6 +799,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-avx2.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
@ -857,4 +860,4 @@
<Filter>src\crypto_core\hchacha20</Filter>
</ClCompile>
</ItemGroup>
</Project>
</Project>

5
builds/msvc/vs2015/libsodium/libsodium.vcxproj
View File

@ -72,6 +72,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-avx2.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ssse3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.c" />
@ -94,7 +95,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-avx2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna32.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna64.h" />
@ -274,4 +275,4 @@
<Xml Include="..\..\..\..\packaging\nuget\package.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>

7
builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
View File

@ -295,7 +295,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h">
<ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-avx2.h">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.h">
@ -799,6 +799,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-avx2.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c">
<Filter>src\crypto_generichash\blake2\ref</Filter>
</ClCompile>
@ -857,4 +860,4 @@
<Filter>src\crypto_core\hchacha20</Filter>
</ClCompile>
</ItemGroup>
</Project>
</Project>

1
src/libsodium/Makefile.am
View File

@ -38,7 +38,6 @@ libsodium_la_SOURCES = \
crypto_generichash/blake2/ref/blake2b-load-sse41.h \
crypto_generichash/blake2/ref/blake2b-load-avx2.h \
crypto_generichash/blake2/ref/blake2b-ref.c \
crypto_generichash/blake2/ref/blake2b-round.h \
crypto_generichash/blake2/ref/generichash_blake2b.c \
crypto_hash/crypto_hash.c \
crypto_hash/sha256/hash_sha256_api.c \

Write Preview
Loading…
Cancel
Save