Skip to content

Commit 6b92cf9

Browse files
CrossVRCrossVR
committed
Add zlib as a submodule
1 parent 223a0d2 commit 6b92cf9

File tree

7 files changed

+259
-16
lines changed

7 files changed

+259
-16
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
[submodule "src/Externals/lzo"]
1414
path = src/Externals/lzo
1515
url = https://github.com/alexgdi/lzo.git
16+
[submodule "src/Externals/zlib"]
17+
path = src/Externals/zlib
18+
url = https://github.com/madler/zlib.git

‎src/Externals/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ maya
1212
nvapi
1313
OpenAutomate
1414
OpenSSL
15-
zlib

‎src/Externals/zlib‎

Submodule zlib added at cacf7f1

‎src/Externals/zlib.vcxproj‎

Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
23+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
24+
</PropertyGroup>
25+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
27+
<ConfigurationType>StaticLibrary</ConfigurationType>
28+
<PlatformToolset>v140</PlatformToolset>
29+
<CharacterSet>MultiByte</CharacterSet>
30+
</PropertyGroup>
31+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
32+
<ConfigurationType>StaticLibrary</ConfigurationType>
33+
<PlatformToolset>v140</PlatformToolset>
34+
<CharacterSet>MultiByte</CharacterSet>
35+
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37+
<ConfigurationType>StaticLibrary</ConfigurationType>
38+
<UseOfMfc>false</UseOfMfc>
39+
<PlatformToolset>v140</PlatformToolset>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42+
<ConfigurationType>StaticLibrary</ConfigurationType>
43+
<UseOfMfc>false</UseOfMfc>
44+
<PlatformToolset>v140</PlatformToolset>
45+
</PropertyGroup>
46+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
47+
<ImportGroup Label="ExtensionSettings">
48+
</ImportGroup>
49+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
50+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
51+
<Import Project="..\Common.props" />
52+
</ImportGroup>
53+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
54+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55+
<Import Project="..\Common.props" />
56+
</ImportGroup>
57+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
58+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59+
<Import Project="..\Common.props" />
60+
</ImportGroup>
61+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
62+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63+
<Import Project="..\Common.props" />
64+
</ImportGroup>
65+
<PropertyGroup Label="UserMacros" />
66+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
67+
<ClCompile>
68+
<Optimization>Disabled</Optimization>
69+
<AdditionalIncludeDirectories>zlib;zlib\contrib\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
70+
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
71+
<ExceptionHandling>
72+
</ExceptionHandling>
73+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
74+
<BufferSecurityCheck>false</BufferSecurityCheck>
75+
<PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
76+
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
77+
<ObjectFileName>$(IntDir)</ObjectFileName>
78+
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
79+
<WarningLevel>Level3</WarningLevel>
80+
<SuppressStartupBanner>true</SuppressStartupBanner>
81+
<DebugInformationFormat>OldStyle</DebugInformationFormat>
82+
</ClCompile>
83+
<ResourceCompile>
84+
<Culture>0x040c</Culture>
85+
</ResourceCompile>
86+
<Lib>
87+
<AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
88+
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
89+
<SuppressStartupBanner>true</SuppressStartupBanner>
90+
</Lib>
91+
</ItemDefinitionGroup>
92+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
93+
<ClCompile>
94+
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
95+
<AdditionalIncludeDirectories>zlib;zlib\contrib\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
96+
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
97+
<StringPooling>true</StringPooling>
98+
<ExceptionHandling>
99+
</ExceptionHandling>
100+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
101+
<BufferSecurityCheck>false</BufferSecurityCheck>
102+
<FunctionLevelLinking>true</FunctionLevelLinking>
103+
<PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
104+
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
105+
<ObjectFileName>$(IntDir)</ObjectFileName>
106+
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
107+
<WarningLevel>Level3</WarningLevel>
108+
<SuppressStartupBanner>true</SuppressStartupBanner>
109+
</ClCompile>
110+
<ResourceCompile>
111+
<Culture>0x040c</Culture>
112+
</ResourceCompile>
113+
<Lib>
114+
<AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
115+
<AdditionalDependencies>zlib\contrib\masmx86\match686.obj;zlib\contrib\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
116+
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
117+
<SuppressStartupBanner>true</SuppressStartupBanner>
118+
</Lib>
119+
</ItemDefinitionGroup>
120+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
121+
<Midl>
122+
<TargetEnvironment>X64</TargetEnvironment>
123+
</Midl>
124+
<ClCompile>
125+
<Optimization>Disabled</Optimization>
126+
<AdditionalIncludeDirectories>zlib;zlib\contrib\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127+
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128+
<ExceptionHandling>
129+
</ExceptionHandling>
130+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
131+
<BufferSecurityCheck>false</BufferSecurityCheck>
132+
<PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
133+
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
134+
<ObjectFileName>$(IntDir)</ObjectFileName>
135+
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
136+
<WarningLevel>Level3</WarningLevel>
137+
<SuppressStartupBanner>true</SuppressStartupBanner>
138+
<DebugInformationFormat>OldStyle</DebugInformationFormat>
139+
</ClCompile>
140+
<ResourceCompile>
141+
<Culture>0x040c</Culture>
142+
</ResourceCompile>
143+
<Lib>
144+
<AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
145+
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
146+
<SuppressStartupBanner>true</SuppressStartupBanner>
147+
</Lib>
148+
</ItemDefinitionGroup>
149+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
150+
<Midl>
151+
<TargetEnvironment>X64</TargetEnvironment>
152+
</Midl>
153+
<ClCompile>
154+
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
155+
<AdditionalIncludeDirectories>zlib;zlib\contrib\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
156+
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
157+
<StringPooling>true</StringPooling>
158+
<ExceptionHandling>
159+
</ExceptionHandling>
160+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
161+
<BufferSecurityCheck>false</BufferSecurityCheck>
162+
<FunctionLevelLinking>true</FunctionLevelLinking>
163+
<PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
164+
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
165+
<ObjectFileName>$(IntDir)</ObjectFileName>
166+
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
167+
<WarningLevel>Level3</WarningLevel>
168+
<SuppressStartupBanner>true</SuppressStartupBanner>
169+
</ClCompile>
170+
<ResourceCompile>
171+
<Culture>0x040c</Culture>
172+
</ResourceCompile>
173+
<Lib>
174+
<AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
175+
<AdditionalDependencies>zlib\contrib\masmx64\gvmat64.obj;zlib\contrib\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
176+
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
177+
<SuppressStartupBanner>true</SuppressStartupBanner>
178+
</Lib>
179+
</ItemDefinitionGroup>
180+
<ItemGroup>
181+
<ClCompile Include="zlib\adler32.c" />
182+
<ClCompile Include="zlib\compress.c" />
183+
<ClCompile Include="zlib\crc32.c" />
184+
<ClCompile Include="zlib\deflate.c" />
185+
<ClCompile Include="zlib\gzclose.c" />
186+
<ClCompile Include="zlib\gzlib.c" />
187+
<ClCompile Include="zlib\gzread.c" />
188+
<ClCompile Include="zlib\gzwrite.c" />
189+
<ClCompile Include="zlib\infback.c" />
190+
<ClCompile Include="zlib\contrib\masmx64\inffas8664.c">
191+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
192+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
193+
</ClCompile>
194+
<ClCompile Include="zlib\inffast.c" />
195+
<ClCompile Include="zlib\inflate.c" />
196+
<ClCompile Include="zlib\inftrees.c" />
197+
<ClCompile Include="zlib\contrib\minizip\ioapi.c" />
198+
<ClCompile Include="zlib\trees.c" />
199+
<ClCompile Include="zlib\uncompr.c" />
200+
<ClCompile Include="zlib\contrib\minizip\unzip.c" />
201+
<ClCompile Include="zlib\contrib\minizip\zip.c" />
202+
<ClCompile Include="zlib\zutil.c" />
203+
</ItemGroup>
204+
<ItemGroup>
205+
<ResourceCompile Include="zlib\contrib\vstudio\vc14\zlib.rc" />
206+
</ItemGroup>
207+
<ItemGroup>
208+
<None Include="zlibvc.def" />
209+
</ItemGroup>
210+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
211+
<ImportGroup Label="ExtensionTargets">
212+
</ImportGroup>
213+
</Project>

‎src/engine.sln‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzo2", "Externals\lzo.vcxpr
166166
EndProject
167167
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "Externals\luajit\src\luajit.vcxproj", "{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}"
168168
EndProject
169+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "Externals\zlib.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
170+
EndProject
169171
Global
170172
GlobalSection(SolutionConfigurationPlatforms) = preSolution
171173
Debug_Dedicated|Mixed Platforms = Debug_Dedicated|Mixed Platforms
@@ -1452,6 +1454,30 @@ Global
14521454
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Mixed Platforms.Build.0 = Release|Win32
14531455
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.ActiveCfg = Release|Win32
14541456
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.Build.0 = Release|Win32
1457+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
1458+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
1459+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
1460+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
1461+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
1462+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
1463+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
1464+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
1465+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
1466+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
1467+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
1468+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
1469+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
1470+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Mixed|Mixed Platforms.Build.0 = Release|Win32
1471+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Mixed|Win32.ActiveCfg = Release|Win32
1472+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Mixed|Win32.Build.0 = Release|Win32
1473+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
1474+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
1475+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
1476+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release_Dedicated|Win32.Build.0 = Release|Win32
1477+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
1478+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Mixed Platforms.Build.0 = Release|Win32
1479+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
1480+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
14551481
EndGlobalSection
14561482
GlobalSection(SolutionProperties) = preSolution
14571483
HideSolutionNode = FALSE
@@ -1505,6 +1531,7 @@ Global
15051531
{67FF193E-2C20-402A-9026-9F5F6327503C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
15061532
{614AA57F-58D7-45A8-A5FF-93F04B05FAC6} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
15071533
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
1534+
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
15081535
EndGlobalSection
15091536
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
15101537
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

‎src/utils/xrLCUtil/xrLCUtil.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6969
<ClCompile>
7070
<Optimization>Disabled</Optimization>
71-
<AdditionalIncludeDirectories>$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71+
<AdditionalIncludeDirectories>$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7272
<PreprocessorDefinitions>_USRDLL;LEVEL_COMPILER;XRLCUTIL_EXPORTS;_USE_MATH_DEFINES;FORCE_NO_EXCEPTIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7373
<StringPooling>true</StringPooling>
7474
<MinimalRebuild>true</MinimalRebuild>
@@ -90,7 +90,7 @@
9090
<RandomizedBaseAddress>false</RandomizedBaseAddress>
9191
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
9292
<TargetMachine>MachineX86</TargetMachine>
93-
<AdditionalDependencies>zlibMS.lib;%(AdditionalDependencies)</AdditionalDependencies>
93+
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
9494
</Link>
9595
</ItemDefinitionGroup>
9696
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -101,7 +101,7 @@
101101
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
102102
<OmitFramePointers>true</OmitFramePointers>
103103
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
104-
<AdditionalIncludeDirectories>$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
104+
<AdditionalIncludeDirectories>$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
105105
<PreprocessorDefinitions>_USRDLL;LEVEL_COMPILER;XRLCUTIL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106106
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
107107
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
@@ -122,13 +122,13 @@
122122
<RandomizedBaseAddress>false</RandomizedBaseAddress>
123123
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
124124
<TargetMachine>MachineX86</TargetMachine>
125-
<AdditionalDependencies>zlibMS.lib;%(AdditionalDependencies)</AdditionalDependencies>
125+
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
126126
</Link>
127127
</ItemDefinitionGroup>
128128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
129129
<ClCompile>
130130
<Optimization>Disabled</Optimization>
131-
<AdditionalIncludeDirectories>$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131+
<AdditionalIncludeDirectories>$(SolutionDir)xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist;$(SolutionDir)Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132132
<PreprocessorDefinitions>_USRDLL;LEVEL_COMPILER;XRLCUTIL_EXPORTS;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133133
<StringPooling>true</StringPooling>
134134
<MinimalRebuild>true</MinimalRebuild>
@@ -151,7 +151,7 @@
151151
<RandomizedBaseAddress>false</RandomizedBaseAddress>
152152
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
153153
<TargetMachine>MachineX86</TargetMachine>
154-
<AdditionalDependencies>zlibMS.lib;%(AdditionalDependencies)</AdditionalDependencies>
154+
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
155155
</Link>
156156
</ItemDefinitionGroup>
157157
<ItemGroup>

0 commit comments

Comments
 (0)