diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj index 9f741e240..5bb05b359 100644 --- a/SMP/libhogweed.vcxproj +++ b/SMP/libhogweed.vcxproj @@ -670,142 +670,142 @@ - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libhogweedd + hogweedd Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libhogweedd_winrt + hogweedd Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libhogweedd - $(ProjectDir)..\..\..\msvc\ + hogweedd + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libhogweedd_winrt - $(ProjectDir)..\..\..\msvc\ + hogweedd + $(ProjectDir)..\msvc\ Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ hogweedd Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweedd_winrt + hogweedd Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ hogweedd - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweedd_winrt - $(ProjectDir)..\..\..\msvc\ + hogweedd + $(ProjectDir)..\msvc\ Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libhogweed + hogweed Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libhogweed_winrt + hogweed Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libhogweed - $(ProjectDir)..\..\..\msvc\ + hogweed + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libhogweed_winrt - $(ProjectDir)..\..\..\msvc\ + hogweed + $(ProjectDir)..\msvc\ Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ hogweed Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ hogweed Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweed_winrt + hogweed Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweed_winrt + hogweed Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ hogweed - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ hogweed - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweed_winrt - $(ProjectDir)..\..\..\msvc\ + hogweed + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - hogweed_winrt - $(ProjectDir)..\..\..\msvc\ + hogweed + $(ProjectDir)..\msvc\ Clean MSB8012 @@ -826,7 +826,7 @@ MachineX86 Windows $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) - libnettled.lib;%(AdditionalDependencies) + nettled.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -950,7 +950,7 @@ del /f /q $(OutDir)\licenses\nettle.txt MachineX86 Windows $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) - libnettled_winrt.lib;%(AdditionalDependencies) + nettled.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -1072,7 +1072,7 @@ del /f /q $(OutDir)\licenses\nettle.txt MachineX64 Windows $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) - libnettled.lib;%(AdditionalDependencies) + nettled.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -1196,7 +1196,7 @@ del /f /q $(OutDir)\licenses\nettle.txt MachineX64 Windows $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) - libnettled_winrt.lib;%(AdditionalDependencies) + nettled.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -1325,7 +1325,7 @@ del /f /q $(OutDir)\licenses\nettle.txt true true 5.1 - nettled.lib;gmpd.lib;%(AdditionalDependencies) + nettled.lib;gmpd.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -1457,7 +1457,7 @@ del /f /q $(OutDir)\licenses\nettle.txt true 10.0 8.1 - nettled.lib;gmpd.lib;%(AdditionalDependencies) + nettled.lib;gmpd.lib;%(AdditionalDependencies) $(OutDir)\lib\x86\$(RootNamespace).winmd /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -1585,7 +1585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) true 6.1 - nettled.lib;gmpd.lib;%(AdditionalDependencies) + nettled.lib;gmpd.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -1715,7 +1715,7 @@ del /f /q $(OutDir)\licenses\nettle.txt true 10.0 8.1 - nettled.lib;gmpd.lib;%(AdditionalDependencies) + nettled.lib;gmpd.lib;%(AdditionalDependencies) $(OutDir)\lib\x64\$(RootNamespace).winmd /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -1845,7 +1845,7 @@ del /f /q $(OutDir)\licenses\nettle.txt MachineX86 Windows $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) - libnettle.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -1975,7 +1975,7 @@ del /f /q $(OutDir)\licenses\nettle.txt MachineX86 Windows $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories) - libnettle_winrt.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -2103,7 +2103,7 @@ del /f /q $(OutDir)\licenses\nettle.txt MachineX64 Windows $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) - libnettle.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -2233,7 +2233,7 @@ del /f /q $(OutDir)\licenses\nettle.txt MachineX64 Windows $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) - libnettle_winrt.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -2368,7 +2368,7 @@ del /f /q $(OutDir)\licenses\nettle.txt true true 5.1 - nettle.lib;gmp.lib;%(AdditionalDependencies) + nettle.lib;gmp.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -2503,7 +2503,7 @@ del /f /q $(OutDir)\licenses\nettle.txt true true 5.1 - libnettle.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -2641,7 +2641,7 @@ del /f /q $(OutDir)\licenses\nettle.txt true 10.0 8.1 - nettle.lib;gmp.lib;%(AdditionalDependencies) + nettle.lib;gmp.lib;%(AdditionalDependencies) $(OutDir)\lib\x86\$(RootNamespace).winmd /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -2780,7 +2780,7 @@ del /f /q $(OutDir)\licenses\nettle.txt true 10.0 8.1 - libnettle_winrt.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) $(OutDir)\lib\x86\$(RootNamespace).winmd /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -2915,7 +2915,7 @@ del /f /q $(OutDir)\licenses\nettle.txt $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) true 6.1 - nettle.lib;gmp.lib;%(AdditionalDependencies) + nettle.lib;gmp.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -3049,7 +3049,7 @@ del /f /q $(OutDir)\licenses\nettle.txt $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories) true 6.1 - libnettle.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -3186,7 +3186,7 @@ del /f /q $(OutDir)\licenses\nettle.txt true 10.0 8.1 - nettle.lib;gmp.lib;%(AdditionalDependencies) + nettle.lib;gmp.lib;%(AdditionalDependencies) $(OutDir)\lib\x64\$(RootNamespace).winmd /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -3324,7 +3324,7 @@ del /f /q $(OutDir)\licenses\nettle.txt true 10.0 8.1 - libnettle_winrt.lib;%(AdditionalDependencies) + nettle.lib;%(AdditionalDependencies) $(OutDir)\lib\x64\$(RootNamespace).winmd /IGNORE:4006,4221,4078 %(AdditionalOptions) diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj index 56583e10f..665e8ef4e 100644 --- a/SMP/libnettle.vcxproj +++ b/SMP/libnettle.vcxproj @@ -812,142 +812,142 @@ - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libnettled + nettled Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libnettled_winrt + nettled Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libnettled - $(ProjectDir)..\..\..\msvc\ + nettled + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libnettled_winrt - $(ProjectDir)..\..\..\msvc\ + nettled + $(ProjectDir)..\msvc\ Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ nettled Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettled_winrt + nettled Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ nettled - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettled_winrt - $(ProjectDir)..\..\..\msvc\ + nettled + $(ProjectDir)..\msvc\ Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libnettle + nettle Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libnettle_winrt + nettle Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libnettle - $(ProjectDir)..\..\..\msvc\ + nettle + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - libnettle_winrt - $(ProjectDir)..\..\..\msvc\ + nettle + $(ProjectDir)..\msvc\ Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ nettle Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ nettle Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettle_winrt + nettle Clean MSB8012 - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettle_winrt + nettle Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ nettle - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ nettle - $(ProjectDir)..\..\..\msvc\ + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettle_winrt - $(ProjectDir)..\..\..\msvc\ + nettle + $(ProjectDir)..\msvc\ Clean MSB8012 $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - nettle_winrt - $(ProjectDir)..\..\..\msvc\ + nettle + $(ProjectDir)..\msvc\ Clean MSB8012 diff --git a/hogweed.pc.in b/hogweed.pc.in index 97fb9d46a..ce977c02e 100644 --- a/hogweed.pc.in +++ b/hogweed.pc.in @@ -13,7 +13,7 @@ URL: http://www.lysator.liu.se/~nisse/nettle Version: @PACKAGE_VERSION@ Requires: @IF_NOT_SHARED@ nettle Requires.private: @IF_SHARED@ nettle -Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@ +Libs: -L${libdir} @HOGWEED@ @IF_NOT_SHARED@ @LIBS@ Libs.private: @IF_SHARED@ @LIBS@ Cflags: -I${includedir} diff --git a/nettle.pc.in b/nettle.pc.in index eb0020caa..6e3ed1e4f 100644 --- a/nettle.pc.in +++ b/nettle.pc.in @@ -7,5 +7,6 @@ Name: Nettle Description: Nettle low-level cryptographic library (symmetric algorithms) URL: http://www.lysator.liu.se/~nisse/nettle Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lnettle +Requires.private: gmp +Libs: -L${libdir} @LIBS@ Cflags: -I${includedir}