From 8cc73f9ed6494ab34afcff73351ef3b27cc17d60 Mon Sep 17 00:00:00 2001
From: Max Golovanov <maxgolov@microsoft.com>
Date: Tue, 4 Sep 2018 16:53:02 -0700
Subject: [PATCH] Fix for invalid machine type in build scripts

---
 build-all.bat                            |  1 -
 zlib/contrib/vstudio/vc14/zlibvc.vcxproj | 26 ++++++++----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/build-all.bat b/build-all.bat
index 9319ee91..40d1c75f 100644
--- a/build-all.bat
+++ b/build-all.bat
@@ -15,7 +15,6 @@ msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win1
 msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64
 msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64
 
-set platform=ARM
 msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=ARM
 msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=ARM
  
\ No newline at end of file
diff --git a/zlib/contrib/vstudio/vc14/zlibvc.vcxproj b/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
index 85dcc485..ab8c13f1 100644
--- a/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
+++ b/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
@@ -387,8 +387,8 @@ bld_ml32.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/MACHINE:ARM %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlib.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -403,8 +403,6 @@ bld_ml32.bat</Command>
       <ImportLibrary>$(OutDir)zlib.lib</ImportLibrary>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
     </PreBuildEvent>
     <Lib>
       <TargetMachine>MachineARM</TargetMachine>
@@ -442,8 +440,8 @@ bld_ml32.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/MACHINE:ARM %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlib.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -457,9 +455,7 @@ bld_ml32.bat</Command>
       </DataExecutionPrevention>
       <ImportLibrary>$(OutDir)zlib.lib</ImportLibrary>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
+    <PreBuildEvent>     
     </PreBuildEvent>
     <Lib>
       <TargetMachine>MachineARM</TargetMachine>
@@ -627,8 +623,8 @@ bld_ml32.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/MACHINE:ARM %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlib.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -643,8 +639,6 @@ bld_ml32.bat</Command>
       <ImportLibrary>$(OutDir)zlib.lib</ImportLibrary>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
     </PreBuildEvent>
     <Lib>
       <TargetMachine>MachineARM</TargetMachine>
@@ -685,8 +679,8 @@ bld_ml32.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/MACHINE:ARM %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlib.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -701,8 +695,6 @@ bld_ml32.bat</Command>
       <ImportLibrary>$(OutDir)zlib.lib</ImportLibrary>
     </Link>
     <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
     </PreBuildEvent>
     <Lib>
       <TargetMachine>MachineARM</TargetMachine>