diff options
| author | Greg Domjan <gorf4673@gmail.com> | 2012-09-14 16:48:12 -0400 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2013-02-23 22:56:32 -0800 |
| commit | b116fb588deee3b3c9092a32783416c456da3bed (patch) | |
| tree | fe6d422de25a5c2442be7374ff5ea7311d11addb | |
| parent | 5afbdabacd496c9dfe204e82e10d8febb4710669 (diff) | |
| download | zlib-b116fb588deee3b3c9092a32783416c456da3bed.tar.gz zlib-b116fb588deee3b3c9092a32783416c456da3bed.tar.bz2 zlib-b116fb588deee3b3c9092a32783416c456da3bed.zip | |
Add contrib/vstudio/vc10 pre-build step for static only.
Also correct typo for 64-bit debug build.
| -rw-r--r-- | contrib/vstudio/vc10/zlibstat.vcxproj | 16 | ||||
| -rw-r--r-- | contrib/vstudio/vc10/zlibvc.vcxproj | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj b/contrib/vstudio/vc10/zlibstat.vcxproj index 2682fca..b9f2bbe 100644 --- a/contrib/vstudio/vc10/zlibstat.vcxproj +++ b/contrib/vstudio/vc10/zlibstat.vcxproj | |||
| @@ -182,6 +182,10 @@ | |||
| 182 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | 182 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> |
| 183 | <SuppressStartupBanner>true</SuppressStartupBanner> | 183 | <SuppressStartupBanner>true</SuppressStartupBanner> |
| 184 | </Lib> | 184 | </Lib> |
| 185 | <PreBuildEvent> | ||
| 186 | <Command>cd ..\..\masmx86 | ||
| 187 | bld_ml32.bat</Command> | ||
| 188 | </PreBuildEvent> | ||
| 185 | </ItemDefinitionGroup> | 189 | </ItemDefinitionGroup> |
| 186 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 190 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 187 | <ClCompile> | 191 | <ClCompile> |
| @@ -210,6 +214,10 @@ | |||
| 210 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | 214 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> |
| 211 | <SuppressStartupBanner>true</SuppressStartupBanner> | 215 | <SuppressStartupBanner>true</SuppressStartupBanner> |
| 212 | </Lib> | 216 | </Lib> |
| 217 | <PreBuildEvent> | ||
| 218 | <Command>cd ..\..\masmx86 | ||
| 219 | bld_ml32.bat</Command> | ||
| 220 | </PreBuildEvent> | ||
| 213 | </ItemDefinitionGroup> | 221 | </ItemDefinitionGroup> |
| 214 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> | 222 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> |
| 215 | <ClCompile> | 223 | <ClCompile> |
| @@ -266,6 +274,10 @@ | |||
| 266 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | 274 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> |
| 267 | <SuppressStartupBanner>true</SuppressStartupBanner> | 275 | <SuppressStartupBanner>true</SuppressStartupBanner> |
| 268 | </Lib> | 276 | </Lib> |
| 277 | <PreBuildEvent> | ||
| 278 | <Command>cd ..\..\masmx64 | ||
| 279 | bld_ml64.bat</Command> | ||
| 280 | </PreBuildEvent> | ||
| 269 | </ItemDefinitionGroup> | 281 | </ItemDefinitionGroup> |
| 270 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | 282 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> |
| 271 | <Midl> | 283 | <Midl> |
| @@ -326,6 +338,10 @@ | |||
| 326 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | 338 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> |
| 327 | <SuppressStartupBanner>true</SuppressStartupBanner> | 339 | <SuppressStartupBanner>true</SuppressStartupBanner> |
| 328 | </Lib> | 340 | </Lib> |
| 341 | <PreBuildEvent> | ||
| 342 | <Command>cd ..\..\masmx64 | ||
| 343 | bld_ml64.bat</Command> | ||
| 344 | </PreBuildEvent> | ||
| 329 | </ItemDefinitionGroup> | 345 | </ItemDefinitionGroup> |
| 330 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | 346 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> |
| 331 | <Midl> | 347 | <Midl> |
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj index 9218fdc..97016a5 100644 --- a/contrib/vstudio/vc10/zlibvc.vcxproj +++ b/contrib/vstudio/vc10/zlibvc.vcxproj | |||
| @@ -383,7 +383,7 @@ bld_ml32.bat</Command> | |||
| 383 | <TargetMachine>MachineX64</TargetMachine> | 383 | <TargetMachine>MachineX64</TargetMachine> |
| 384 | </Link> | 384 | </Link> |
| 385 | <PreBuildEvent> | 385 | <PreBuildEvent> |
| 386 | <Command>cd ..\..\contrib\masmx64 | 386 | <Command>cd ..\..\masmx64 |
| 387 | bld_ml64.bat</Command> | 387 | bld_ml64.bat</Command> |
| 388 | </PreBuildEvent> | 388 | </PreBuildEvent> |
| 389 | </ItemDefinitionGroup> | 389 | </ItemDefinitionGroup> |