Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[shiftmedia-libgcrypt] new port (Windows fork of Libgcrypt) #26364

Merged
merged 31 commits into from
Aug 19, 2022
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
bc53711
[shiftmedia-libgcrypt] new port
wrobelda Aug 16, 2022
3a95a46
[shiftmedia-libgcrypt] add license
wrobelda Aug 16, 2022
1cd86d5
[shiftmedia-libgcrypt] fix formatting
wrobelda Aug 16, 2022
dd1c684
[shiftmedia-libgcrypt] add version
wrobelda Aug 16, 2022
200b401
[shiftmedia-libgcrypt] update to 1.10.1, also support UWP
wrobelda Aug 16, 2022
353a7bb
[shiftmedia-libgcrypt] update version
wrobelda Aug 16, 2022
cfb6e17
[ci.baseline.txt] restore gpg-error running on CI
wrobelda Aug 16, 2022
feffc18
[libgpg-error] add TargetPlatformMinVersion
wrobelda Aug 16, 2022
cbded1a
[libgpg-error] update versions
wrobelda Aug 16, 2022
0a57df4
[shiftmedia-libgcrypt] fix supported platform
wrobelda Aug 16, 2022
069300d
[shiftmedia-libgcrypt] fix missing Version in .pc
wrobelda Aug 16, 2022
edc8ddf
[shiftmedia-libgcrypt] update version
wrobelda Aug 16, 2022
ef97828
[shiftmedia-libgcrypt] remove leftover warning
wrobelda Aug 16, 2022
6e4c59f
[shiftmedia-libgcrypt] update version
wrobelda Aug 16, 2022
6084eec
Update shiftmedia-libgcrypt.json
Cheney-W Aug 17, 2022
3aa9557
Update libgpg-error.json
Cheney-W Aug 17, 2022
2e440ad
[shiftmedia-libgcrypt] install includes instead of moving them around…
wrobelda Aug 17, 2022
7440e82
[shiftmedia-libgcrypt] update version
wrobelda Aug 17, 2022
ad5fb08
[shiftmedia-libgcrypt] wrap paths in quotes
wrobelda Aug 18, 2022
4c1dca8
[shiftmedia-libgcrypt] support for Windows implies UWP
wrobelda Aug 18, 2022
12b6841
[shiftmedia-libgcrypt] update version
wrobelda Aug 18, 2022
1d2cb57
[shiftmedia-libgcrypt] use vcpkg_replace_string() instead of patches
wrobelda Aug 18, 2022
c7b98b5
[shiftmedia-libgcrypt] update version
wrobelda Aug 18, 2022
8a26453
[shiftmedia-libgcrypt] gpg-error already inupstream .pc as Requires.p…
wrobelda Aug 18, 2022
1375c18
[shiftmedia-libgcrypt] -L${libdir} already in upstream .pc
wrobelda Aug 18, 2022
1e3ef57
[shiftmedia-libgcrypt] update version
wrobelda Aug 18, 2022
37a4643
[shiftmedia-libgcrypt] pass OutDir as property, no need to patch
wrobelda Aug 18, 2022
bf8d8bf
[shiftmedia-libgcrypt] update version
wrobelda Aug 18, 2022
7f82cf0
[shiftmedia-libgcrypt] msbuild adds a subfolder to OutDir on UWP
wrobelda Aug 18, 2022
146c50c
[shiftmedia-libgcrypt] fix aclocal installation path
wrobelda Aug 18, 2022
1aea01b
[shiftmedia-libgcrypt] update version
wrobelda Aug 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/libgpg-error/TargetPlatformMinVersion.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/SMP/libgpg-error_winrt.vcxproj b/SMP/llibgpg-error_winrt.vcxproj
index e1acf679..f9c302be 100644
--- a/SMP/libgpg-error_winrt.vcxproj
+++ b/SMP/libgpg-error_winrt.vcxproj
@@ -3,6 +3,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{AA4A762D-A8D7-4F68-9B79-FBE63C6BE105}</ProjectGuid>
<RootNamespace>gpg-error</RootNamespace>
+ <TargetPlatformMinVersion>10.0.17200.0</TargetPlatformMinVersion>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this specific value?

Copy link
Contributor Author

@wrobelda wrobelda Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I saw in the CI logs used as a minimum required when comparing against – then empty – TargetPlatformMinVersion value.
That having said, I did not test anything less than that, to be frank.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, after doing a little digging, it seems as though this change would be fine. I believe TargetPlatformMinVersion is used to determine the fallback framework and the package format. I believe that setting TargetPlatformMinVersion to 10.0.17200.0 would result in the fallback framework being .NET Framework 4.6.1 and the packaging format being msix, none of which matters for our purposes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for checking that.

</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="smp_winrt.props" />
1 change: 1 addition & 0 deletions ports/libgpg-error/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
PATCHES
outdir.patch
runtime.patch
TargetPlatformMinVersion.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
Expand Down
2 changes: 1 addition & 1 deletion ports/libgpg-error/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libgpg-error",
"version": "1.42",
"port-version": 3,
"port-version": 4,
"description": "A common dependency of all GnuPG components",
"homepage": "https://gnupg.org/software/libgpg-error/index.html",
"supports": "!(windows & (arm | arm64))"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any chance that this may fix arm or arm64?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/ShiftMediaProject/libgpg-error/blob/master/SMP/libgpg-error.vcxproj doesn't support arm/arm64 platforms, so that can't work ("The specified solution configuration "ReleaseDLLWinRT|arm" is invalid").

That having said, I was close (#20447) to getting libgpg-error build natively, but didn't find time to finish it. Wanted to resume work on it, actually, but help would most likely be needed and appreciated :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, just wanted to be sure it was considered since our CI does not validate supports expressions

Expand Down
143 changes: 143 additions & 0 deletions ports/shiftmedia-libgcrypt/gpgerror.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
diff --git a/SMP/libgcrypt.vcxproj b/SMP/libgcrypt.vcxproj
index b8d06f19..12d59dd5 100644
--- a/SMP/libgcrypt.vcxproj
+++ b/SMP/libgcrypt.vcxproj
@@ -70,7 +70,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>libgpg-errord.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-errord.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
<PostBuildEvent>
@@ -237,7 +237,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
<PostBuildEvent>
@@ -292,7 +292,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
<PostBuildEvent>
@@ -404,7 +404,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
</ClCompile>
<Link>
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile>
- <AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
@@ -516,7 +516,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
</ClCompile>
<Link>
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile>
- <AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
diff --git a/SMP/libgcrypt_winrt.vcxproj b/SMP/libgcrypt_winrt.vcxproj
index e1acf679..62f3f7b6 100644
--- a/SMP/libgcrypt_winrt.vcxproj
+++ b/SMP/libgcrypt_winrt.vcxproj
@@ -15,7 +15,7 @@
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>libgpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-errord.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
<PostBuildEvent>
@@ -70,7 +70,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>libgpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-errord.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
<PostBuildEvent>
@@ -126,7 +126,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
</ClCompile>
<Link>
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile>
- <AdditionalDependencies>gpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-errord.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
@@ -182,7 +182,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
</ClCompile>
<Link>
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile>
- <AdditionalDependencies>gpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-errord.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
@@ -237,7 +237,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
<PostBuildEvent>
@@ -292,7 +292,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
<DisableSpecificWarnings>4146;4018;4028;4244;4267;4715;4334;4996;4703;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
<PostBuildEvent>
@@ -348,7 +348,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
</ClCompile>
<Link>
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile>
- <AdditionalDependencies>gpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
@@ -404,7 +404,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
</ClCompile>
<Link>
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile>
- <AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
@@ -460,7 +460,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
</ClCompile>
<Link>
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile>
- <AdditionalDependencies>gpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
@@ -516,7 +516,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
</ClCompile>
<Link>
<ModuleDefinitionFile>..\src\libgcrypt.def</ModuleDefinitionFile>
- <AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>gpg-error.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
188 changes: 188 additions & 0 deletions ports/shiftmedia-libgcrypt/outdir.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props
index 9dc3dc02..f25786fc 100644
--- a/SMP/smp_deps.props
+++ b/SMP/smp_deps.props
@@ -105,7 +105,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>
@@ -113,7 +113,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>
@@ -121,7 +121,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>
@@ -129,7 +129,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>
@@ -137,7 +137,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>
@@ -145,7 +145,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>
@@ -153,7 +153,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>
@@ -161,7 +161,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>
@@ -169,7 +169,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLStaticDeps|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>
@@ -177,7 +177,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLStaticDeps|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_deps.props b/SMP/smp_winrt_deps.props
index fe8c8950..c0cb1637 100644
--- a/SMP/smp_winrt_deps.props
+++ b/SMP/smp_winrt_deps.props
@@ -116,7 +116,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>
@@ -124,7 +124,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>
@@ -132,7 +132,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>
@@ -140,7 +140,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>
@@ -148,7 +148,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>
@@ -156,7 +156,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>
@@ -164,7 +164,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>
@@ -172,7 +172,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>
@@ -180,7 +180,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRTStaticDeps|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>
@@ -188,7 +188,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRTStaticDeps|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>
Loading