From af51a5b69b795483a3fe6e2dd8bbf54b46620968 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Sun, 15 Feb 2015 19:49:22 -0700 Subject: [PATCH 1/3] Tell Visual Studio to not automatically generate a manifest file --- Source/Project64/Project64.vcxproj | 666 +++++++++++++++-------------- 1 file changed, 341 insertions(+), 325 deletions(-) diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index 262c536f7..8fe83d514 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -1,326 +1,342 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {7E534C8E-1ACE-4A88-8807-39A11ED4DA18} - Project64 - - - - Application - v120_xp - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.21005.1 - - - - false - false - - Windows - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NotUsing - - - NotUsing - - - NotUsing - - - - - - - - - - - - - - - - - - - - - - User Interface;%(AdditionalIncludeDirectories) - User Interface;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3326e128-33af-422c-bb7c-67cc6b915610} - false - - - {731bd205-2826-4631-b7af-117658e88dbc} - false - - - {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} - false - - - {a4d13408-a794-4199-8fc7-4a9a32505005} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18} + Project64 + + + + Application + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + false + + + false + + + + false + false + + Windows + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + + + NotUsing + + + NotUsing + + + + + + + + + + + + + + + + + + + + + + User Interface;%(AdditionalIncludeDirectories) + User Interface;%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {3326e128-33af-422c-bb7c-67cc6b915610} + false + + + {731bd205-2826-4631-b7af-117658e88dbc} + false + + + {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} + false + + + {a4d13408-a794-4199-8fc7-4a9a32505005} + false + + + + + \ No newline at end of file From 4fec91eb133892191fdf9d274891bd627edb1db0 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Sun, 15 Feb 2015 19:52:59 -0700 Subject: [PATCH 2/3] Update Project64.exe.manifest --- Source/Project64/Project64.exe.manifest | 48 ++++++++++++++----------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/Source/Project64/Project64.exe.manifest b/Source/Project64/Project64.exe.manifest index b11392b3c..ab4df5075 100644 --- a/Source/Project64/Project64.exe.manifest +++ b/Source/Project64/Project64.exe.manifest @@ -1,22 +1,28 @@ - - - -Project64 - - - - - + + + + + + + + + + + + + + + From e0ecffe5c1e562d2e32ddd64d300aee977884101 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Sun, 15 Feb 2015 19:54:42 -0700 Subject: [PATCH 3/3] Update UI Resources.rc to use manifest file --- Source/Project64/User Interface/UI Resources.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Project64/User Interface/UI Resources.rc b/Source/Project64/User Interface/UI Resources.rc index 505a6a735..fc95e32fc 100644 --- a/Source/Project64/User Interface/UI Resources.rc +++ b/Source/Project64/User Interface/UI Resources.rc @@ -17,6 +17,8 @@ ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\Project64.exe.manifest" + #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US