Merge pull request #720 from oddMLan/i-herd-u-liek-common-controls-6.0

Fix manifest file generation (themed window controls again)

Source/Project64/Project64.exe.manifest

@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-  <trustInfo xmlns='urn:schemas-microsoft-com:asm.v3'>
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <assemblyIdentity
-    version='2.1.0.1'
-    processorArchitecture='x86'
-    name='Project64'
-    type='win32'
-  />
-  <dependency>
-  <dependentAssembly>
-    <assemblyIdentity
-      type='win32'
-      name='Microsoft.Windows.Common-Controls'
-      version='6.0.0.0'
-      processorArchitecture='X86'
-      publicKeyToken='6595b64144ccf1df'
-      language='*'
-    />
-  </dependentAssembly>
-  </dependency>
-</assembly>

Source/Project64/User Interface/UI Resources.rc

@@ -19,10 +19,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
 
-#ifdef _M_IX86
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\Project64.exe.manifest"
-#endif
-
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

Source/Project64/stdafx.h

@@ -13,6 +13,8 @@
 #pragma warning(disable:4247)
 #pragma warning(disable:4786)
 
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
+
 #include <common/MemTest.h>
 #include <common/CriticalSection.h>
 #include <windows.h>