mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 19:29:01 +08:00
206 lines
9.5 KiB
Diff
206 lines
9.5 KiB
Diff
diff --git a/SMP/config.h b/SMP/config.h
|
|
index e4de0f1..ba41eb4 100644
|
|
--- a/SMP/config.h
|
|
+++ b/SMP/config.h
|
|
@@ -102,7 +102,7 @@
|
|
#define HAVE_SYS_TYPES_H 1
|
|
|
|
/* Define to 1 if you have the <unistd.h> header file. */
|
|
-#define HAVE_UNISTD_H 1
|
|
+//#define HAVE_UNISTD_H 1
|
|
|
|
/* Define to 1 if you have the <valgrind/memcheck.h> header file. */
|
|
/* #undef HAVE_VALGRIND_MEMCHECK_H */
|
|
diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj
|
|
index 476f7a7..308bd0b 100644
|
|
--- a/SMP/libhogweed_winrt.vcxproj
|
|
+++ b/SMP/libhogweed_winrt.vcxproj
|
|
@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libhogweed.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
<AdditionalOptions>/IGNORE:4006,4221,4078 %(AdditionalOptions)</AdditionalOptions>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libhogweed.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
<AdditionalOptions>/IGNORE:4006,4221,4078 %(AdditionalOptions)</AdditionalOptions>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libhogweed.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
<AdditionalOptions>/IGNORE:4006,4221,4078 %(AdditionalOptions)</AdditionalOptions>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libhogweed.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
<AdditionalOptions>/IGNORE:4006,4221,4078 %(AdditionalOptions)</AdditionalOptions>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj
|
|
index 088cb85..cc2cbeb 100644
|
|
--- a/SMP/libnettle.vcxproj
|
|
+++ b/SMP/libnettle.vcxproj
|
|
@@ -18,7 +18,7 @@
|
|
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
|
</ClCompile>
|
|
<Lib>
|
|
- <AdditionalDependencies>libgmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Lib>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
|
</ClCompile>
|
|
<Lib>
|
|
- <AdditionalDependencies>libgmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Lib>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
|
</ClCompile>
|
|
<Lib>
|
|
- <AdditionalDependencies>libgmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Lib>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -586,7 +586,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
|
</ClCompile>
|
|
<Lib>
|
|
- <AdditionalDependencies>libgmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Lib>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -815,7 +815,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>libgmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -1043,7 +1043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>libgmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
diff --git a/SMP/libnettle_winrt.vcxproj b/SMP/libnettle_winrt.vcxproj
|
|
index cb650ab..188f67a 100644
|
|
--- a/SMP/libnettle_winrt.vcxproj
|
|
+++ b/SMP/libnettle_winrt.vcxproj
|
|
@@ -18,7 +18,7 @@
|
|
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
|
</ClCompile>
|
|
<Lib>
|
|
- <AdditionalDependencies>libgmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Lib>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
|
</ClCompile>
|
|
<Lib>
|
|
- <AdditionalDependencies>libgmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Lib>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>gmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>gmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>gmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>gmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
|
</ClCompile>
|
|
<Lib>
|
|
- <AdditionalDependencies>libgmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Lib>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -585,7 +585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
|
</ClCompile>
|
|
<Lib>
|
|
- <AdditionalDependencies>libgmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Lib>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -699,7 +699,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>gmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -813,7 +813,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>libgmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -927,7 +927,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>gmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|
|
@@ -1041,7 +1041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
|
|
</ClCompile>
|
|
<Link>
|
|
<ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
|
|
- <AdditionalDependencies>libgmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
+ <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
<Command>mkdir "$(OutDir)"\include
|