From 67007451b38a6c351ae2bd909391936751c2fdff Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 12 Aug 2014 10:26:42 +0100
Subject: [PATCH] windows: remove custom manifest

The manifest was intended to enable XP-style controls, but at this
point it doesn't seem to do anything except interefere with some
variants of the build tools.
---
 racket/src/racket/main.c                 |  8 --------
 racket/src/worksp/gc2/make.rkt           |  2 --
 racket/src/worksp/gracket/gracket.rc     |  2 --
 racket/src/worksp/racket/racket.manifest | 22 ----------------------
 racket/src/worksp/racket/racket.rc       |  2 --
 5 files changed, 36 deletions(-)
 delete mode 100644 racket/src/worksp/racket/racket.manifest

diff --git a/racket/src/racket/main.c b/racket/src/racket/main.c
index da232f584d..bf75f44f31 100644
--- a/racket/src/racket/main.c
+++ b/racket/src/racket/main.c
@@ -495,14 +495,6 @@ static void do_scheme_rep(Scheme_Env *env, FinishArgs *fa)
   }
 }
 
-/*========================================================================*/
-/*                         win32 manifest                                 */
-/*========================================================================*/
-
-#if _MSC_VER >= 1400
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#endif
-
 /*========================================================================*/
 /*                         junk for testing                               */
 /*========================================================================*/
diff --git a/racket/src/worksp/gc2/make.rkt b/racket/src/worksp/gc2/make.rkt
index 8aee356f5c..0c4e6112af 100644
--- a/racket/src/worksp/gc2/make.rkt
+++ b/racket/src/worksp/gc2/make.rkt
@@ -327,7 +327,6 @@
 	    '("libracket3mxxxxxxx.dll")
 	    '("delayimp.lib")
 	    exe "" #t))
-(system- "mt.exe -manifest ../../../Racket.exe.manifest -outputresource:../../../Racket.exe;1")
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -359,7 +358,6 @@
 	    '("advapi32.lib" 
 	      "delayimp.lib") 
 	    "../../../lib/GRacket.exe" " /subsystem:windows" #t))
-(system- "mt.exe -manifest ../../../lib/GRacket.exe.manifest -outputresource:../../../lib/GRacket.exe;1")
 
 (system- (format "~a /MT /O2 /DMZ_PRECISE_GC /I../../racket/include /I.. /c ../../racket/dynsrc/mzdyn.c /Fomzdyn3m.obj"
 		 cl.exe))
diff --git a/racket/src/worksp/gracket/gracket.rc b/racket/src/worksp/gracket/gracket.rc
index bbec46184d..bf333838e4 100644
--- a/racket/src/worksp/gracket/gracket.rc
+++ b/racket/src/worksp/gracket/gracket.rc
@@ -45,5 +45,3 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gracket.manifest" 
diff --git a/racket/src/worksp/racket/racket.manifest b/racket/src/worksp/racket/racket.manifest
deleted file mode 100644
index 5ead5ea419..0000000000
--- a/racket/src/worksp/racket/racket.manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-<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">
-	</requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32"
-			name="Microsoft.Windows.Common-Controls"
-			version="6.0.0.0"
-			processorArchitecture="*"
-			publicKeyToken="6595b64144ccf1df"
-			language="*">
-      </assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-</assembly>
diff --git a/racket/src/worksp/racket/racket.rc b/racket/src/worksp/racket/racket.rc
index 81193c9cdd..9ec9edb06f 100644
--- a/racket/src/worksp/racket/racket.rc
+++ b/racket/src/worksp/racket/racket.rc
@@ -45,5 +45,3 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "racket.manifest"