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 846fa99e9b..09599720c9 100644
--- a/racket/src/worksp/gc2/make.rkt
+++ b/racket/src/worksp/gc2/make.rkt
@@ -341,7 +341,7 @@
'("libracket3mxxxxxxx.dll")
'("delayimp.lib")
exe "" #t))
-(system- "mt.exe -manifest ../../../Racket.exe.manifest -outputresource:../../../Racket.exe;1")
+(system- "mt.exe -manifest ../racket/racket.manifest -outputresource:../../../Racket.exe;1")
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -373,7 +373,7 @@
'("advapi32.lib"
"delayimp.lib")
"../../../lib/GRacket.exe" " /subsystem:windows" #t))
-(system- "mt.exe -manifest ../../../lib/GRacket.exe.manifest -outputresource:../../../lib/GRacket.exe;1")
+(system- "mt.exe -manifest ../gracket/gracket.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/addman.bat b/racket/src/worksp/gracket/addman.bat
new file mode 100644
index 0000000000..a92ea2e1c6
--- /dev/null
+++ b/racket/src/worksp/gracket/addman.bat
@@ -0,0 +1 @@
+mt.exe -manifest ../gracket/gracket.manifest -outputresource:../../../lib/GRacketCGC.exe;1
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/gracket/gracket.vcproj b/racket/src/worksp/gracket/gracket.vcproj
index fb802ad1c6..89c1343b8a 100644
--- a/racket/src/worksp/gracket/gracket.vcproj
+++ b/racket/src/worksp/gracket/gracket.vcproj
@@ -63,6 +63,10 @@
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
+
+
@@ -123,9 +131,6 @@
-
+
+
+
+
@@ -330,9 +351,6 @@
-
+
+
diff --git a/racket/src/worksp/gracket/gracket.vcxproj b/racket/src/worksp/gracket/gracket.vcxproj
index 632b247327..1a0d559168 100644
--- a/racket/src/worksp/gracket/gracket.vcxproj
+++ b/racket/src/worksp/gracket/gracket.vcxproj
@@ -86,6 +86,11 @@
+
+
+addman.bat
+
+
diff --git a/racket/src/worksp/racket/addman.bat b/racket/src/worksp/racket/addman.bat
new file mode 100644
index 0000000000..58315e486f
--- /dev/null
+++ b/racket/src/worksp/racket/addman.bat
@@ -0,0 +1 @@
+mt.exe -manifest ../racket/racket.manifest -outputresource:../../../RacketCGC.exe;1
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"
diff --git a/racket/src/worksp/racket/racket.vcproj b/racket/src/worksp/racket/racket.vcproj
index 99825c062b..cb07b21109 100644
--- a/racket/src/worksp/racket/racket.vcproj
+++ b/racket/src/worksp/racket/racket.vcproj
@@ -60,7 +60,7 @@
/>
diff --git a/racket/src/worksp/racket/racket.vcxproj b/racket/src/worksp/racket/racket.vcxproj
index 3b47d6f49c..f4574c13b5 100644
--- a/racket/src/worksp/racket/racket.vcxproj
+++ b/racket/src/worksp/racket/racket.vcxproj
@@ -95,9 +95,9 @@ exit 1
"$(TargetPath)" -cu ..\..\racket\mkincludes.rkt "$(TargetDir)/include/" ..\..\racket ..
if errorlevel 1 exit 1
cd ..\..\racket\dynsrc
-mkmzdyn.bat $(Configuration)
+call mkmzdyn.bat $(Configuration)
cd ..\..\worksp\racket
-
+addman.bat