Skip to content

Create cgmanifest + move zlib, nlohmann to third_party #1438

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.

Sign up for GitHub

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

Open
pablo-msft wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Create cgmanifest + move zlib, nlohmann to third_party #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7153ae2
cgmanifest
pablo-msft May 16, 2026
50d1a2b
move zlib
pablo-msft May 16, 2026
56ea3f1
missed paths
pablo-msft May 16, 2026
e79cc84
fix cgmanifest
pablo-msft May 16, 2026
60a263c
move nlohmann
pablo-msft May 16, 2026
4939c2e
cmake comment
pablo-msft May 16, 2026
4123ffd
includes
pablo-msft May 16, 2026
6c5ea8f
+
pablo-msft May 16, 2026
f82b3e7
+
pablo-msft May 16, 2026
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
3 changes: 2 additions & 1 deletion Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ cc_library_shared {
"lib",
"lib/include/public",
"lib/include",
"lib/include/mat"
"lib/include/mat",
"third_party"
],
min_sdk_version: "29",
shared_libs: [
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,10 @@ include_directories(lib/pal)
# add_subdirectory(bondlite/tests)
#endif()

# Include repo root to allow includes of sqlite, zlib, and nlohmann
# Include repo root to allow includes of sqlite
include_directories(${CMAKE_SOURCE_DIR})
# Include third_party to allow includes of zlib and nlohmann
include_directories(${CMAKE_SOURCE_DIR}/third_party)

if(BUILD_HEADERS)
add_subdirectory(lib/include)
Expand Down
4 changes: 2 additions & 2 deletions Solutions/Clienttelemetry/Clienttelemetry.vcxitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..;$(MSBuildThisFileDirectory)..\..\third_party</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -200,7 +200,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\StringUtils.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\ZlibUtils.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\Utils.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\nlohmann\json.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\third_party\nlohmann\json.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp.template" />
Expand Down
2 changes: 1 addition & 1 deletion Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\StringUtils.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\ZlibUtils.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\Utils.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\nlohmann\json.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\third_party\nlohmann\json.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp.template" />
Expand Down
2 changes: 1 addition & 1 deletion Solutions/MSTelemetrySDK.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\tests\googletes
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite-uwp", "..\sqliteUWP\sqlite-uwp.vcxproj", "{6883A688-89F5-424A-9BFA-50D42F691B29}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\third_party\zlib\contrib\vstudio\vc14\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PAL", "PAL", "{34B3E59D-E740-4C23-ACEE-E94C80E83A18}"
EndProject
Expand Down
12 changes: 6 additions & 6 deletions Solutions/net40/net40.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)\before.targets" Condition="Exists('$(SolutionDir)\before.targets')" />
<ItemGroup Label="ProjectConfigurations">
Expand Down Expand Up @@ -73,31 +73,31 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.pdb;*.obj.enc;*.ilk;*.ipdb;*.iobj;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>$(AriaDepsLibPath);$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
<LibraryWPath />
<EnableManagedIncrementalBuild>false</EnableManagedIncrementalBuild>
<LinkKeyFile>$(ProjectDir)Test.snk</LinkKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.pdb;*.obj.enc;*.ilk;*.ipdb;*.iobj;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>$(AriaDepsLibPath);$(UniversalCRT_LibraryPath_x86);$(LibraryPath)</LibraryPath>
<LibraryWPath />
<EnableManagedIncrementalBuild>false</EnableManagedIncrementalBuild>
<LinkKeyFile>$(ProjectDir)Test.snk</LinkKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.pdb;*.obj.enc;*.ilk;*.ipdb;*.iobj;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>$(AriaDepsLibPath);$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
<LibraryWPath />
<EnableManagedIncrementalBuild>false</EnableManagedIncrementalBuild>
<LinkKeyFile>$(ProjectDir)Test.snk</LinkKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.pdb;*.obj.enc;*.ilk;*.ipdb;*.iobj;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>$(AriaDepsLibPath);$(UniversalCRT_LibraryPath_x86);$(LibraryPath)</LibraryPath>
<LibraryWPath />
<EnableManagedIncrementalBuild>false</EnableManagedIncrementalBuild>
Expand Down Expand Up @@ -282,7 +282,7 @@
<ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
<Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<ProjectReference Include="..\..\third_party\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
</ProjectReference>
<ProjectReference Include="..\win32-lib\win32-lib.vcxproj">
Expand Down
18 changes: 9 additions & 9 deletions Solutions/win10-cs/win10-cs.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,56 +112,56 @@
<GenerateManifest>true</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows.UWP</TargetName>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(AriaDepsLibPath)\sqlite-uwp;$(LibraryPath);$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>true</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows.UWP</TargetName>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(AriaDepsLibPath)\sqlite-uwp;$(LibraryPath);$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows.UWP</TargetName>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(AriaDepsLibPath)\sqlite-uwp;$(LibraryPath);$(VC_LibraryPath_ARM);$(WindowsSDK_LibraryPath_ARM);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows.UWP</TargetName>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(AriaDepsLibPath)\sqlite-uwp;$(LibraryPath);$(VC_LibraryPath_ARM);$(WindowsSDK_LibraryPath_ARM);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<GenerateManifest>true</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows.UWP</TargetName>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(AriaDepsLibPath)\sqlite-uwp;$(LibraryPath);$(VC_LibraryPath_ARM);$(WindowsSDK_LibraryPath_ARM);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<GenerateManifest>true</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows.UWP</TargetName>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(AriaDepsLibPath)\sqlite-uwp;$(LibraryPath);$(VC_LibraryPath_ARM);$(WindowsSDK_LibraryPath_ARM);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<GenerateManifest>true</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows.UWP</TargetName>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(AriaDepsLibPath)\sqlite-uwp;$(LibraryPath);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<GenerateManifest>true</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<TargetName>Microsoft.Applications.Telemetry.Windows.UWP</TargetName>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir);$(SolutionDir)..;$(SolutionDir)..\third_party;$(SolutionDir)..\third_party\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CustomIncludePath);$(IncludePath)</IncludePath>
<LibraryPath>%(AdditionalLibraryDirectories);$(AriaDepsLibPath)\zlib;$(AriaDepsLibPath)\sqlite-uwp;$(LibraryPath);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand Down Expand Up @@ -401,7 +401,7 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<ProjectReference Include="..\..\third_party\zlib\contrib\vstudio\vc14\zlibvc.vcxproj">
<Project>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
Loading
Loading