Merge pull request #1903 from mstorsjo/fix-msvc-autobuild

Fix an error in the msvc autobuild script, output into the correct outdir used by the project files

build/AutoBuildForWPAndWindows.bat

@@ -383,9 +383,18 @@ goto :EOF
   set vConfiguration=%1
   set vBuildOption=%2
   cd %RootDir%
-  set FullDestDir=%BinDir%\%vArcType%-%vConfiguration%-ASM-%vASMFlag%
+  if "%vArcType%"=="arm" (
+    set vBinDirName=ARM
+  ) else if "%vArcType%"=="i386" (
+    set vBinDirName=Win32
+  ) else (
+    set vBinDirName=x64
+  )
+  set ArchDestDir=%BinDir%\%vBinDirName%
+  set FullDestDir=%BinDir%\%vBinDirName%\%vConfiguration%
   echo copying dll files to destination folder...
   echo FullDestDir is %FullDestDir%
+  if not exist %ArchDestDir% md %ArchDestDir%
   if exist %FullDestDir% (
     rd /s /q %FullDestDir%
   )
@@ -393,12 +402,11 @@ goto :EOF
 
   echo current dir is:
   cd
-  set DestDir=bin/%vArcType%-%vConfiguration%-ASM-%vASMFlag%
+  set DestDir=bin/%vBinDirName%/%vConfiguration%
   echo DestDir is %DestDir%
   if "%vOSType%"=="msvc-wp" (
      set aFileList=%DllFile% %LibFile% %PDBFile% %UTDllFile%
-  )
-  else (
+  ) else (
      set aFileList=%DllFile% %LibFile% %PDBFile% %UTBinFile% %EncBinFile% %DecBinFile%
   )
   for %%k in (%aFileList%) do (