mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-25 19:37:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
027b48d217
vcpkg/ports/shiftmedia-libgpg-error/outdir.patch

153 lines
8.0 KiB
Diff
Raw Normal View History

[libgpg-error] update to 1.42, add Windows support, arm fixes (#16932) * [libgpg-error] update to 1.41, support Win, fix linux-arm - Support Windows builds using ShiftMediaProject - Update to 1.41 (latest by ShiftMediaProject) - Fix linux-arm build - Also convert CONTROL to JSON manifest format * [libgpg-error] update versions * [libgpg-error] use git tag instead of sha Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [libgpg-error] warn about using ShiftMediaProject fork Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [libgpg-error] 'Rebuild' target is implied and redundant Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [libgpg-error] remove leftover from nettle port Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [libgpg-error] fix compilation issues * [libgpg-error] update to 1.42 * [libgpg-error] update versions * [libgpg-error] attempt to fix x64-windows-static-md triplet * [libgpg-error] update versions Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-06-03 08:53:16 +08:00
diff --git a/SMP/smp.props b/SMP/smp.props
index e2ed214..fc70bd8 100644
--- a/SMP/smp.props
+++ b/SMP/smp.props
@@ -87,7 +87,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>lib$(RootNamespace)d</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -95,7 +95,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>lib$(RootNamespace)d</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -103,7 +103,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
<TargetName>$(RootNamespace)d</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -111,7 +111,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<TargetName>$(RootNamespace)d</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -119,7 +119,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>lib$(RootNamespace)</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -127,7 +127,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>lib$(RootNamespace)</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -135,7 +135,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
<TargetName>$(RootNamespace)</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -143,7 +143,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
<TargetName>$(RootNamespace)</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
index 9b453a5..cb5f090 100644
--- a/SMP/smp_winrt.props
+++ b/SMP/smp_winrt.props
@@ -98,7 +98,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'">
<TargetName>lib$(RootNamespace)d_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -106,7 +106,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
<TargetName>lib$(RootNamespace)d_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -114,7 +114,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
<TargetName>$(RootNamespace)d_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -122,7 +122,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
<TargetName>$(RootNamespace)d_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -130,7 +130,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'">
<TargetName>lib$(RootNamespace)_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -138,7 +138,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
<TargetName>lib$(RootNamespace)_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -146,7 +146,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
<TargetName>$(RootNamespace)_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
@@ -154,7 +154,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
<TargetName>$(RootNamespace)_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
Reference in New Issue Copy Permalink