Unify manifest file for Win32 and Win64 - also fixes MSDEV command line compilation issue

bochs/CHANGES

@@ -16,6 +16,9 @@ Bochs repository moved to the SVN version control !
 - SF patches applied
   [3190995] add eth backend based on Slirp by Heikki Lindholm
 
+- these S.F. bugs were closed/fixed
+  [3197425] Error compile with vmx in vs2008/2010 and for correct x64
+
 -------------------------------------------------------------------------
 Changes in 2.4.6 (February 22, 2011):
 

bochs/build/win32/bochs.manifest

@@ -2,7 +2,7 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
     version="2.4.6.0"
-    processorArchitecture="X86"
+    processorArchitecture="*"
     name="Bochs.Bochs.Bochs"
     type="win32"
 />
@@ -13,7 +13,7 @@
             type="win32"
             name="Microsoft.Windows.Common-Controls"
             version="6.0.0.0"
-            processorArchitecture="X86"
+            processorArchitecture="*"
             publicKeyToken="6595b64144ccf1df"
             language="*"
         />

bochs/build/win32/bochs.win64.manifest

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
-    version="2.4.6.0"
-    processorArchitecture="X86"
-    name="Bochs.Bochs.Bochs"
-    type="win32"
-/>
-<description>Quartus</description>
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            processorArchitecture="amd64"
-            publicKeyToken="6595b64144ccf1df"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-</assembly>

bochs/win32res.rc

@@ -5,13 +5,8 @@
 ICON_BOCHS ICON build\win32\nsis\logo.ico
 1 ICON build\win32\nsis\bochs.ico
 
-#ifndef _WIN64
-// Manifest for 32-bit Windows
-1 24 build\win32\bochs.win32.manifest
-#else
-// Manifest for 64-bit Windows
-1 24 build\win32\bochs.win64.manifest
-#endif
+// Manifest for both 32-bit and 64-bit Windows
+1 24 build\win32\bochs.manifest
 
 ASK_DLG DIALOG 30, 30, 200, 100
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU