diff options
Diffstat (limited to 'contrib/vstudio/vc10/zlibvc.vcxproj')
-rw-r--r-- | contrib/vstudio/vc10/zlibvc.vcxproj | 58 |
1 files changed, 17 insertions, 41 deletions
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj index 6ff9ddb..19dfc35 100644 --- a/contrib/vstudio/vc10/zlibvc.vcxproj +++ b/contrib/vstudio/vc10/zlibvc.vcxproj | |||
@@ -197,8 +197,8 @@ | |||
197 | </Midl> | 197 | </Midl> |
198 | <ClCompile> | 198 | <ClCompile> |
199 | <Optimization>Disabled</Optimization> | 199 | <Optimization>Disabled</Optimization> |
200 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 200 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
201 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 201 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
202 | <ExceptionHandling> | 202 | <ExceptionHandling> |
203 | </ExceptionHandling> | 203 | </ExceptionHandling> |
204 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | 204 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
@@ -219,7 +219,7 @@ | |||
219 | </ResourceCompile> | 219 | </ResourceCompile> |
220 | <Link> | 220 | <Link> |
221 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | 221 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> |
222 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 222 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
223 | <SuppressStartupBanner>true</SuppressStartupBanner> | 223 | <SuppressStartupBanner>true</SuppressStartupBanner> |
224 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | 224 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> |
225 | <GenerateDebugInformation>true</GenerateDebugInformation> | 225 | <GenerateDebugInformation>true</GenerateDebugInformation> |
@@ -229,10 +229,6 @@ | |||
229 | <DataExecutionPrevention> | 229 | <DataExecutionPrevention> |
230 | </DataExecutionPrevention> | 230 | </DataExecutionPrevention> |
231 | </Link> | 231 | </Link> |
232 | <PreBuildEvent> | ||
233 | <Command>cd ..\..\masmx86 | ||
234 | bld_ml32.bat</Command> | ||
235 | </PreBuildEvent> | ||
236 | </ItemDefinitionGroup> | 232 | </ItemDefinitionGroup> |
237 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> | 233 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> |
238 | <Midl> | 234 | <Midl> |
@@ -244,7 +240,7 @@ bld_ml32.bat</Command> | |||
244 | </Midl> | 240 | </Midl> |
245 | <ClCompile> | 241 | <ClCompile> |
246 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 242 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
247 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 243 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
248 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 244 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
249 | <StringPooling>true</StringPooling> | 245 | <StringPooling>true</StringPooling> |
250 | <ExceptionHandling> | 246 | <ExceptionHandling> |
@@ -288,8 +284,8 @@ bld_ml32.bat</Command> | |||
288 | </Midl> | 284 | </Midl> |
289 | <ClCompile> | 285 | <ClCompile> |
290 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 286 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
291 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 287 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
292 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 288 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
293 | <StringPooling>true</StringPooling> | 289 | <StringPooling>true</StringPooling> |
294 | <ExceptionHandling> | 290 | <ExceptionHandling> |
295 | </ExceptionHandling> | 291 | </ExceptionHandling> |
@@ -312,7 +308,7 @@ bld_ml32.bat</Command> | |||
312 | </ResourceCompile> | 308 | </ResourceCompile> |
313 | <Link> | 309 | <Link> |
314 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | 310 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> |
315 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 311 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
316 | <SuppressStartupBanner>true</SuppressStartupBanner> | 312 | <SuppressStartupBanner>true</SuppressStartupBanner> |
317 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | 313 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
318 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | 314 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> |
@@ -322,10 +318,6 @@ bld_ml32.bat</Command> | |||
322 | <DataExecutionPrevention> | 318 | <DataExecutionPrevention> |
323 | </DataExecutionPrevention> | 319 | </DataExecutionPrevention> |
324 | </Link> | 320 | </Link> |
325 | <PreBuildEvent> | ||
326 | <Command>cd ..\..\masmx86 | ||
327 | bld_ml32.bat</Command> | ||
328 | </PreBuildEvent> | ||
329 | </ItemDefinitionGroup> | 321 | </ItemDefinitionGroup> |
330 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 322 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
331 | <Midl> | 323 | <Midl> |
@@ -337,8 +329,8 @@ bld_ml32.bat</Command> | |||
337 | </Midl> | 329 | </Midl> |
338 | <ClCompile> | 330 | <ClCompile> |
339 | <Optimization>Disabled</Optimization> | 331 | <Optimization>Disabled</Optimization> |
340 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 332 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
341 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 333 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
342 | <ExceptionHandling> | 334 | <ExceptionHandling> |
343 | </ExceptionHandling> | 335 | </ExceptionHandling> |
344 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 336 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -358,7 +350,7 @@ bld_ml32.bat</Command> | |||
358 | <Culture>0x040c</Culture> | 350 | <Culture>0x040c</Culture> |
359 | </ResourceCompile> | 351 | </ResourceCompile> |
360 | <Link> | 352 | <Link> |
361 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 353 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
362 | <SuppressStartupBanner>true</SuppressStartupBanner> | 354 | <SuppressStartupBanner>true</SuppressStartupBanner> |
363 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | 355 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> |
364 | <GenerateDebugInformation>true</GenerateDebugInformation> | 356 | <GenerateDebugInformation>true</GenerateDebugInformation> |
@@ -366,10 +358,6 @@ bld_ml32.bat</Command> | |||
366 | <SubSystem>Windows</SubSystem> | 358 | <SubSystem>Windows</SubSystem> |
367 | <TargetMachine>MachineX64</TargetMachine> | 359 | <TargetMachine>MachineX64</TargetMachine> |
368 | </Link> | 360 | </Link> |
369 | <PreBuildEvent> | ||
370 | <Command>cd ..\..\masmx64 | ||
371 | bld_ml64.bat</Command> | ||
372 | </PreBuildEvent> | ||
373 | </ItemDefinitionGroup> | 361 | </ItemDefinitionGroup> |
374 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | 362 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> |
375 | <Midl> | 363 | <Midl> |
@@ -381,7 +369,7 @@ bld_ml64.bat</Command> | |||
381 | </Midl> | 369 | </Midl> |
382 | <ClCompile> | 370 | <ClCompile> |
383 | <Optimization>Disabled</Optimization> | 371 | <Optimization>Disabled</Optimization> |
384 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 372 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
385 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 373 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
386 | <ExceptionHandling> | 374 | <ExceptionHandling> |
387 | </ExceptionHandling> | 375 | </ExceptionHandling> |
@@ -424,7 +412,7 @@ bld_ml64.bat</Command> | |||
424 | </Midl> | 412 | </Midl> |
425 | <ClCompile> | 413 | <ClCompile> |
426 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 414 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
427 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 415 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
428 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 416 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
429 | <StringPooling>true</StringPooling> | 417 | <StringPooling>true</StringPooling> |
430 | <ExceptionHandling> | 418 | <ExceptionHandling> |
@@ -465,7 +453,7 @@ bld_ml64.bat</Command> | |||
465 | </Midl> | 453 | </Midl> |
466 | <ClCompile> | 454 | <ClCompile> |
467 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 455 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
468 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 456 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
469 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 457 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
470 | <StringPooling>true</StringPooling> | 458 | <StringPooling>true</StringPooling> |
471 | <ExceptionHandling> | 459 | <ExceptionHandling> |
@@ -510,8 +498,8 @@ bld_ml64.bat</Command> | |||
510 | </Midl> | 498 | </Midl> |
511 | <ClCompile> | 499 | <ClCompile> |
512 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 500 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
513 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 501 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
514 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 502 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
515 | <StringPooling>true</StringPooling> | 503 | <StringPooling>true</StringPooling> |
516 | <ExceptionHandling> | 504 | <ExceptionHandling> |
517 | </ExceptionHandling> | 505 | </ExceptionHandling> |
@@ -533,7 +521,7 @@ bld_ml64.bat</Command> | |||
533 | <Culture>0x040c</Culture> | 521 | <Culture>0x040c</Culture> |
534 | </ResourceCompile> | 522 | </ResourceCompile> |
535 | <Link> | 523 | <Link> |
536 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 524 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
537 | <SuppressStartupBanner>true</SuppressStartupBanner> | 525 | <SuppressStartupBanner>true</SuppressStartupBanner> |
538 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | 526 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
539 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | 527 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> |
@@ -541,10 +529,6 @@ bld_ml64.bat</Command> | |||
541 | <SubSystem>Windows</SubSystem> | 529 | <SubSystem>Windows</SubSystem> |
542 | <TargetMachine>MachineX64</TargetMachine> | 530 | <TargetMachine>MachineX64</TargetMachine> |
543 | </Link> | 531 | </Link> |
544 | <PreBuildEvent> | ||
545 | <Command>cd ..\..\masmx64 | ||
546 | bld_ml64.bat</Command> | ||
547 | </PreBuildEvent> | ||
548 | </ItemDefinitionGroup> | 532 | </ItemDefinitionGroup> |
549 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | 533 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> |
550 | <Midl> | 534 | <Midl> |
@@ -556,7 +540,7 @@ bld_ml64.bat</Command> | |||
556 | </Midl> | 540 | </Midl> |
557 | <ClCompile> | 541 | <ClCompile> |
558 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 542 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
559 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 543 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
560 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 544 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
561 | <StringPooling>true</StringPooling> | 545 | <StringPooling>true</StringPooling> |
562 | <ExceptionHandling> | 546 | <ExceptionHandling> |
@@ -601,14 +585,6 @@ bld_ml64.bat</Command> | |||
601 | <ClCompile Include="..\..\..\gzread.c" /> | 585 | <ClCompile Include="..\..\..\gzread.c" /> |
602 | <ClCompile Include="..\..\..\gzwrite.c" /> | 586 | <ClCompile Include="..\..\..\gzwrite.c" /> |
603 | <ClCompile Include="..\..\..\infback.c" /> | 587 | <ClCompile Include="..\..\..\infback.c" /> |
604 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
605 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
606 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
607 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
608 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
609 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
610 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
611 | </ClCompile> | ||
612 | <ClCompile Include="..\..\..\inffast.c" /> | 588 | <ClCompile Include="..\..\..\inffast.c" /> |
613 | <ClCompile Include="..\..\..\inflate.c" /> | 589 | <ClCompile Include="..\..\..\inflate.c" /> |
614 | <ClCompile Include="..\..\..\inftrees.c" /> | 590 | <ClCompile Include="..\..\..\inftrees.c" /> |