From 4736a76f8a8a34b7fba39b660e18f9b2d15082d0 Mon Sep 17 00:00:00 2001
From: oddMLan <oddMLan2@gmail.com>
Date: Fri, 30 Oct 2015 00:26:23 -0700
Subject: [PATCH 1/3] Link to Common Controls 6.0 With this we get themed
 buttons and controls.

---
 Source/Project64/stdafx.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Project64/stdafx.h b/Source/Project64/stdafx.h
index 2c0f1950b..f7f730497 100644
--- a/Source/Project64/stdafx.h
+++ b/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>

From f2a5b01620d4ba1e5e7eccaa0f6469d205e2d073 Mon Sep 17 00:00:00 2001
From: oddMLan <oddMLan2@gmail.com>
Date: Fri, 30 Oct 2015 00:39:40 -0700
Subject: [PATCH 2/3] Delete statement linking to old manifest file Visual
 Studio will generate one during compilation.

---
 Source/Project64/User Interface/UI Resources.rc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Source/Project64/User Interface/UI Resources.rc b/Source/Project64/User Interface/UI Resources.rc
index 3c1555d97..a7bee1480 100644
--- a/Source/Project64/User Interface/UI Resources.rc	
+++ b/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

From 0b5fa5ba555ade6b4b6c7a08c31242e0865aab24 Mon Sep 17 00:00:00 2001
From: oddMLan <oddMLan2@gmail.com>
Date: Fri, 30 Oct 2015 00:44:44 -0700
Subject: [PATCH 3/3] Delete Project64.exe.manifest Redundant since Visual
 Studio will generate an intermediate manifest and embed it into the
 executable. So it should be safe to delete.

---
 Source/Project64/Project64.exe.manifest | 28 -------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 Source/Project64/Project64.exe.manifest

diff --git a/Source/Project64/Project64.exe.manifest b/Source/Project64/Project64.exe.manifest
deleted file mode 100644
index ab4df5075..000000000
--- a/Source/Project64/Project64.exe.manifest
+++ /dev/null
@@ -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>