Skip to content

Commit ae32637

Browse files
CrossVRCrossVR
committed
Externals: Fix zlib project configuration.
1 parent cc2f94a commit ae32637

File tree

4 files changed

+21
-29
lines changed

4 files changed

+21
-29
lines changed

‎src/Externals/BugTrap.vcxproj‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<ResourceOutputFileName>$(IntDir)$(TargetName).res</ResourceOutputFileName>
9090
</ResourceCompile>
9191
<Link>
92-
<AdditionalDependencies>zlibstat.lib;ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
92+
<AdditionalDependencies>ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
9393
<ModuleDefinitionFile>BugTrap\source\Client\BugTrap.def</ModuleDefinitionFile>
9494
<GenerateDebugInformation>true</GenerateDebugInformation>
9595
<GenerateMapFile>false</GenerateMapFile>
@@ -129,7 +129,7 @@
129129
<ResourceOutputFileName>$(IntDir)$(TargetName).res</ResourceOutputFileName>
130130
</ResourceCompile>
131131
<Link>
132-
<AdditionalDependencies>zlibstat.lib;ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
132+
<AdditionalDependencies>ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
133133
<ModuleDefinitionFile>
134134
</ModuleDefinitionFile>
135135
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -167,7 +167,7 @@
167167
<ResourceOutputFileName>$(IntDir)$(TargetName).res</ResourceOutputFileName>
168168
</ResourceCompile>
169169
<Link>
170-
<AdditionalDependencies>zlibstat.lib;ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
170+
<AdditionalDependencies>ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
171171
<ModuleDefinitionFile>BugTrap\source\Client\BugTrap.def</ModuleDefinitionFile>
172172
<GenerateDebugInformation>true</GenerateDebugInformation>
173173
<GenerateMapFile>false</GenerateMapFile>
@@ -209,7 +209,7 @@
209209
<ResourceOutputFileName>$(IntDir)$(TargetName).res</ResourceOutputFileName>
210210
</ResourceCompile>
211211
<Link>
212-
<AdditionalDependencies>zlibstat.lib;ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
212+
<AdditionalDependencies>ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
213213
<ModuleDefinitionFile>
214214
</ModuleDefinitionFile>
215215
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -362,6 +362,11 @@
362362
<ItemGroup>
363363
<ResourceCompile Include="BugTrap\source\Client\BugTrap.rc" />
364364
</ItemGroup>
365+
<ItemGroup>
366+
<ProjectReference Include="zlib.vcxproj">
367+
<Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
368+
</ProjectReference>
369+
</ItemGroup>
365370
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
366371
<ImportGroup Label="ExtensionTargets">
367372
</ImportGroup>

‎src/Externals/zlib.vcxproj‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,18 @@
6363
<Import Project="..\Common.props" />
6464
</ImportGroup>
6565
<PropertyGroup Label="UserMacros" />
66+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
67+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
68+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
6670
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6771
<ClCompile>
6872
<Optimization>Disabled</Optimization>
6973
<AdditionalIncludeDirectories>zlib;zlib\contrib\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7074
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7175
<ExceptionHandling>
7276
</ExceptionHandling>
73-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
7477
<BufferSecurityCheck>false</BufferSecurityCheck>
75-
<PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
7678
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
7779
<ObjectFileName>$(IntDir)</ObjectFileName>
7880
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
@@ -85,22 +87,19 @@
8587
</ResourceCompile>
8688
<Lib>
8789
<AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
88-
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
8990
<SuppressStartupBanner>true</SuppressStartupBanner>
9091
</Lib>
9192
</ItemDefinitionGroup>
9293
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9394
<ClCompile>
9495
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
9596
<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+
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9798
<StringPooling>true</StringPooling>
9899
<ExceptionHandling>
99100
</ExceptionHandling>
100-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
101101
<BufferSecurityCheck>false</BufferSecurityCheck>
102102
<FunctionLevelLinking>true</FunctionLevelLinking>
103-
<PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
104103
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
105104
<ObjectFileName>$(IntDir)</ObjectFileName>
106105
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
@@ -112,8 +111,6 @@
112111
</ResourceCompile>
113112
<Lib>
114113
<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>
117114
<SuppressStartupBanner>true</SuppressStartupBanner>
118115
</Lib>
119116
</ItemDefinitionGroup>
@@ -127,9 +124,7 @@
127124
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128125
<ExceptionHandling>
129126
</ExceptionHandling>
130-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
131127
<BufferSecurityCheck>false</BufferSecurityCheck>
132-
<PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
133128
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
134129
<ObjectFileName>$(IntDir)</ObjectFileName>
135130
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
@@ -142,7 +137,6 @@
142137
</ResourceCompile>
143138
<Lib>
144139
<AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
145-
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
146140
<SuppressStartupBanner>true</SuppressStartupBanner>
147141
</Lib>
148142
</ItemDefinitionGroup>
@@ -153,14 +147,12 @@
153147
<ClCompile>
154148
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
155149
<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>
150+
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
157151
<StringPooling>true</StringPooling>
158152
<ExceptionHandling>
159153
</ExceptionHandling>
160-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
161154
<BufferSecurityCheck>false</BufferSecurityCheck>
162155
<FunctionLevelLinking>true</FunctionLevelLinking>
163-
<PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
164156
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
165157
<ObjectFileName>$(IntDir)</ObjectFileName>
166158
<ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
@@ -172,8 +164,6 @@
172164
</ResourceCompile>
173165
<Lib>
174166
<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>
177167
<SuppressStartupBanner>true</SuppressStartupBanner>
178168
</Lib>
179169
</ItemDefinitionGroup>
@@ -204,9 +194,6 @@
204194
<ItemGroup>
205195
<ResourceCompile Include="zlib\contrib\vstudio\vc14\zlib.rc" />
206196
</ItemGroup>
207-
<ItemGroup>
208-
<None Include="zlibvc.def" />
209-
</ItemGroup>
210197
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
211198
<ImportGroup Label="ExtensionTargets">
212199
</ImportGroup>

‎src/utils/xrLCUtil/xrLCUtil.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
<RandomizedBaseAddress>false</RandomizedBaseAddress>
9191
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
9292
<TargetMachine>MachineX86</TargetMachine>
93-
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
9493
</Link>
9594
</ItemDefinitionGroup>
9695
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -122,7 +121,6 @@
122121
<RandomizedBaseAddress>false</RandomizedBaseAddress>
123122
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
124123
<TargetMachine>MachineX86</TargetMachine>
125-
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
126124
</Link>
127125
</ItemDefinitionGroup>
128126
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
@@ -151,7 +149,6 @@
151149
<RandomizedBaseAddress>false</RandomizedBaseAddress>
152150
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
153151
<TargetMachine>MachineX86</TargetMachine>
154-
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
155152
</Link>
156153
</ItemDefinitionGroup>
157154
<ItemGroup>
@@ -170,6 +167,9 @@
170167
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
171168
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
172169
</ProjectReference>
170+
<ProjectReference Include="..\..\Externals\zlib.vcxproj">
171+
<Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
172+
</ProjectReference>
173173
</ItemGroup>
174174
<ItemGroup>
175175
<ClInclude Include="ILevelCompilerLogger.hpp" />

‎src/utils/xrLC_Light/xrLC_Light.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
<RandomizedBaseAddress>false</RandomizedBaseAddress>
8585
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
8686
<TargetMachine>MachineX86</TargetMachine>
87-
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
8887
</Link>
8988
</ItemDefinitionGroup>
9089
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -111,7 +110,6 @@
111110
<RandomizedBaseAddress>false</RandomizedBaseAddress>
112111
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
113112
<TargetMachine>MachineX86</TargetMachine>
114-
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
115113
</Link>
116114
</ItemDefinitionGroup>
117115
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
@@ -135,7 +133,6 @@
135133
<RandomizedBaseAddress>false</RandomizedBaseAddress>
136134
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
137135
<TargetMachine>MachineX86</TargetMachine>
138-
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
139136
</Link>
140137
</ItemDefinitionGroup>
141138
<ItemGroup>
@@ -353,6 +350,9 @@
353350
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
354351
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
355352
</ProjectReference>
353+
<ProjectReference Include="..\..\Externals\zlib.vcxproj">
354+
<Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
355+
</ProjectReference>
356356
</ItemGroup>
357357
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
358358
<ImportGroup Label="ExtensionTargets">

0 commit comments

Comments
 (0)