Add contrib/vstudio/vc10 pre-build step for static only.

Also correct typo for 64-bit debug build.

diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj b/contrib/vstudio/vc10/zlibstat.vcxproj
index 2682fca24a6272e25081c9cc69926f84f2dd6a6b..b9f2bbe5f0b19a7ac93781ba04b1042b4a7c4d05 100644 (file)
--- a/contrib/vstudio/vc10/zlibstat.vcxproj
+++ b/contrib/vstudio/vc10/zlibstat.vcxproj
@@ -182,6 +182,10 @@
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </Lib>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\masmx86\r
+bld_ml32.bat</Command>\r
+    </PreBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
@@ -210,6 +214,10 @@
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </Lib>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\masmx86\r
+bld_ml32.bat</Command>\r
+    </PreBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">\r
     <ClCompile>\r
@@ -266,6 +274,10 @@
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </Lib>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\masmx64\r
+bld_ml64.bat</Command>\r
+    </PreBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">\r
     <Midl>\r
@@ -326,6 +338,10 @@
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </Lib>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\masmx64\r
+bld_ml64.bat</Command>\r
+    </PreBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">\r
     <Midl>\r

diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj
index 9218fdce92093635415c3bb518141848354f8a3d..97016a57396977927bf33e5608dc3b22e3402504 100644 (file)
--- a/contrib/vstudio/vc10/zlibvc.vcxproj
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -383,7 +383,7 @@ bld_ml32.bat</Command>
       <TargetMachine>MachineX64</TargetMachine>\r
     </Link>\r
     <PreBuildEvent>\r
-      <Command>cd ..\..\contrib\masmx64\r
+      <Command>cd ..\..\masmx64\r
 bld_ml64.bat</Command>\r
     </PreBuildEvent>\r
   </ItemDefinitionGroup>\r