Skip to content

Commit 36ceb0d

Browse files
author
Christopher Wu
committed
Add zstd library into uuu
Pass build Signed-off-by: Christopher Wu <christopher.wu@nxp.com>
1 parent c7fe0b6 commit 36ceb0d

5 files changed

+27
-10
lines changed

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
[submodule "bzip2"]
88
path = bzip2
99
url = git://sourceware.org/git/bzip2.git
10+
[submodule "zstd"]
11+
path = zstd
12+
url = https://github.com/facebook/zstd.git

‎msvc/libuuu.vcxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -114,21 +114,21 @@
114114
<LinkIncremental>true</LinkIncremental>
115115
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
116116
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
117-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\zlib;..\libsparse\include;..\bzip2</IncludePath>
117+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\zlib;..\libsparse\include;..\bzip2;..\zstd\lib</IncludePath>
118118
</PropertyGroup>
119119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
120120
<LinkIncremental>true</LinkIncremental>
121-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\zlib;..\libsparse\include;..\bzip2</IncludePath>
121+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\zlib;..\libsparse\include;..\bzip2;..\zstd\lib</IncludePath>
122122
</PropertyGroup>
123123
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
124124
<LinkIncremental>false</LinkIncremental>
125125
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
126126
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
127-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\zlib;..\libsparse\include;..\bzip2</IncludePath>
127+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\zlib;..\libsparse\include;..\bzip2;..\zstd\lib</IncludePath>
128128
</PropertyGroup>
129129
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
130130
<LinkIncremental>false</LinkIncremental>
131-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\zlib;..\libsparse\include;..\bzip2</IncludePath>
131+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\zlib;..\libsparse\include;..\bzip2;..\zstd\lib</IncludePath>
132132
</PropertyGroup>
133133
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
134134
<ClCompile>

‎msvc/uuu-static-link.sln

+13-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "..\l
1313
EndProject
1414
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuu-static-link", "uuu-static-link.vcxproj", "{2950F8EE-7895-4431-858A-C21EE105C242}"
1515
ProjectSection(ProjectDependencies) = postProject
16-
{59666402-A775-49AC-A9BD-19FD528F5FD9} = {59666402-A775-49AC-A9BD-19FD528F5FD9}
17-
{B54C35CD-5FFE-4FEA-90BA-32894BCFC6BF} = {B54C35CD-5FFE-4FEA-90BA-32894BCFC6BF}
1816
{048A9BD1-EEF8-4119-9DEF-219D7E177AAC} = {048A9BD1-EEF8-4119-9DEF-219D7E177AAC}
1917
{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {349EE8F9-7D25-4909-AAF5-FF3FADE72187}
18+
{59666402-A775-49AC-A9BD-19FD528F5FD9} = {59666402-A775-49AC-A9BD-19FD528F5FD9}
19+
{8BFD8150-94D5-4BF9-8A50-7BD9929A0850} = {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}
20+
{B54C35CD-5FFE-4FEA-90BA-32894BCFC6BF} = {B54C35CD-5FFE-4FEA-90BA-32894BCFC6BF}
2021
EndProjectSection
2122
EndProject
23+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzstd", "..\zstd\build\VS2010\libzstd\libzstd.vcxproj", "{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}"
24+
EndProject
2225
Global
2326
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2427
Debug|x64 = Debug|x64
@@ -67,6 +70,14 @@ Global
6770
{2950F8EE-7895-4431-858A-C21EE105C242}.Release|x64.Build.0 = Release|x64
6871
{2950F8EE-7895-4431-858A-C21EE105C242}.Release|x86.ActiveCfg = Release|Win32
6972
{2950F8EE-7895-4431-858A-C21EE105C242}.Release|x86.Build.0 = Release|Win32
73+
{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.ActiveCfg = Debug|x64
74+
{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.Build.0 = Debug|x64
75+
{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x86.ActiveCfg = Debug|Win32
76+
{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x86.Build.0 = Debug|Win32
77+
{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.ActiveCfg = Release|x64
78+
{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.Build.0 = Release|x64
79+
{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x86.ActiveCfg = Release|Win32
80+
{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x86.Build.0 = Release|Win32
7081
EndGlobalSection
7182
GlobalSection(SolutionProperties) = preSolution
7283
HideSolutionNode = FALSE

‎msvc/uuu-static-link.vcxproj

+6-4
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<Link>
117117
<SubSystem>Console</SubSystem>
118118
<GenerateDebugInformation>true</GenerateDebugInformation>
119-
<AdditionalDependencies>../libusb/$(Platform)/$(Configuration)/lib/libusb-1.0.lib;$(Platform)/$(Configuration)/libuuu.lib;$(Platform)/$(Configuration)/zlib.lib;%(AdditionalDependencies);$(Platform)/$(Configuration)/bzip2.lib</AdditionalDependencies>
119+
<AdditionalDependencies>../libusb/$(Platform)/$(Configuration)/lib/libusb-1.0.lib;$(Platform)/$(Configuration)/libuuu.lib;$(Platform)/$(Configuration)/zlib.lib;%(AdditionalDependencies);$(Platform)/$(Configuration)/bzip2.lib;$(SolutionDir)bin\$(Platform)_$(Configuration)\libzstd_static.lib</AdditionalDependencies>
120120
</Link>
121121
<PreBuildEvent>
122122
<Command>echo R^"####( &gt; $(SolutionDir)\..\uuu\uuu.clst
@@ -164,7 +164,9 @@ echo )####^" &gt;&gt; $(SolutionDir)\..\uuu\nand_burn_loader.clst
164164
<Link>
165165
<SubSystem>Console</SubSystem>
166166
<GenerateDebugInformation>true</GenerateDebugInformation>
167-
<AdditionalDependencies>../libusb/$(Platform)/$(Configuration)/lib/libusb-1.0.lib;$(Platform)/$(Configuration)/libuuu.lib;$(Platform)/$(Configuration)/zlib.lib;%(AdditionalDependencies);$(Platform)/$(Configuration)/bzip2.lib</AdditionalDependencies>
167+
<AdditionalDependencies>../libusb/$(Platform)/$(Configuration)/lib/libusb-1.0.lib;$(Platform)/$(Configuration)/libuuu.lib;$(Platform)/$(Configuration)/zlib.lib;%(AdditionalDependencies);$(Platform)/$(Configuration)/bzip2.lib;$(SolutionDir)bin\$(Platform)_$(Configuration)\libzstd_static.lib</AdditionalDependencies>
168+
<AdditionalLibraryDirectories>
169+
</AdditionalLibraryDirectories>
168170
</Link>
169171
<PreBuildEvent>
170172
<Command>echo R^"####( &gt; $(SolutionDir)\..\uuu\uuu.clst
@@ -217,7 +219,7 @@ echo )####^" &gt;&gt; $(SolutionDir)\..\uuu\nand_burn_loader.clst
217219
<EnableCOMDATFolding>true</EnableCOMDATFolding>
218220
<OptimizeReferences>true</OptimizeReferences>
219221
<GenerateDebugInformation>true</GenerateDebugInformation>
220-
<AdditionalDependencies>../libusb/$(Platform)/$(Configuration)/lib/libusb-1.0.lib;$(Platform)/$(Configuration)/libuuu.lib;$(Platform)/$(Configuration)/zlib.lib;%(AdditionalDependencies);$(Platform)/$(Configuration)/bzip2.lib</AdditionalDependencies>
222+
<AdditionalDependencies>../libusb/$(Platform)/$(Configuration)/lib/libusb-1.0.lib;$(Platform)/$(Configuration)/libuuu.lib;$(Platform)/$(Configuration)/zlib.lib;%(AdditionalDependencies);$(Platform)/$(Configuration)/bzip2.lib;$(SolutionDir)bin\$(Platform)_$(Configuration)\libzstd_static.lib</AdditionalDependencies>
221223
</Link>
222224
<PreBuildEvent>
223225
<Command>echo R^"####( &gt; $(SolutionDir)\..\uuu\uuu.clst
@@ -270,7 +272,7 @@ echo )####^" &gt;&gt; $(SolutionDir)\..\uuu\nand_burn_loader.clst
270272
<EnableCOMDATFolding>true</EnableCOMDATFolding>
271273
<OptimizeReferences>true</OptimizeReferences>
272274
<GenerateDebugInformation>true</GenerateDebugInformation>
273-
<AdditionalDependencies>../libusb/$(Platform)/$(Configuration)/lib/libusb-1.0.lib;$(Platform)/$(Configuration)/libuuu.lib;$(Platform)/$(Configuration)/zlib.lib;%(AdditionalDependencies);$(Platform)/$(Configuration)/bzip2.lib</AdditionalDependencies>
275+
<AdditionalDependencies>../libusb/$(Platform)/$(Configuration)/lib/libusb-1.0.lib;$(Platform)/$(Configuration)/libuuu.lib;$(Platform)/$(Configuration)/zlib.lib;%(AdditionalDependencies);$(Platform)/$(Configuration)/bzip2.lib;$(SolutionDir)bin\$(Platform)_$(Configuration)\libzstd_static.lib</AdditionalDependencies>
274276
</Link>
275277
<PreBuildEvent>
276278
<Command>echo R^"####( &gt; $(SolutionDir)\..\uuu\uuu.clst

‎zstd

Submodule zstd added at b944db0

0 commit comments

Comments
 (0)