From 321196255abe909904d03be5a34f63a5e2f528b4 Mon Sep 17 00:00:00 2001
From: Samuel Serapion <samuel.serapion@gmail.com>
Date: Fri, 13 Nov 2009 09:24:35 +0000
Subject: [PATCH] - re-add explorer (old one) to build, it builds. - use amd64
 specific manifest file. - still not a valid exe according to windows 7

svn path=/branches/ros-amd64-bringup/; revision=44124
---
 .../explorer/explorer.exe.amd64.manifest      | 22 +++++++++++++++++++
 reactos/base/shell/explorer/explorer.rbuild   |  1 -
 .../base/shell/explorer/explorer_intres.rc    |  4 ++++
 reactos/base/shell/shell.rbuild               |  8 +++----
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 reactos/base/shell/explorer/explorer.exe.amd64.manifest

diff --git a/reactos/base/shell/explorer/explorer.exe.amd64.manifest b/reactos/base/shell/explorer/explorer.exe.amd64.manifest
new file mode 100644
index 00000000000..61aceffc839
--- /dev/null
+++ b/reactos/base/shell/explorer/explorer.exe.amd64.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="amd64"
+    name="ReactOS.Explorer"
+    type="win32"
+/>
+<description>ROS Explorer</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="amd64"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/shell/explorer/explorer.rbuild b/reactos/base/shell/explorer/explorer.rbuild
index 04084aac222..ecb39753bd5 100644
--- a/reactos/base/shell/explorer/explorer.rbuild
+++ b/reactos/base/shell/explorer/explorer.rbuild
@@ -66,7 +66,6 @@
 	</if>
 	<file>explorer.rc</file>
 	<linkerflag>--enable-stdcall-fixup</linkerflag>
-	<linkerflag>'$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)'</linkerflag>
 </module>
 <installfile installbase=".">explorer-cfg-template.xml</installfile>
 <directory name="notifyhook">
diff --git a/reactos/base/shell/explorer/explorer_intres.rc b/reactos/base/shell/explorer/explorer_intres.rc
index a8d5f41439c..2cafd7ff7a8 100644
--- a/reactos/base/shell/explorer/explorer_intres.rc
+++ b/reactos/base/shell/explorer/explorer_intres.rc
@@ -104,8 +104,12 @@ BEGIN
     "END\r\n"
     "#endif\r\n"
     "#ifndef _DEBUG\r\n"
+    "#ifdef _AMD64_"
+    "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE ""explorer.exe.amd64.manifest""\r\n"
+    "#else"
     "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE ""explorer.exe.manifest""\r\n"
     "#endif\r\n"
+    "#endif\r\n"
     "\r\n"
     "#include ""explorer-bg.rc""\r\n"
     "#include ""explorer-cz.rc""\r\n"
diff --git a/reactos/base/shell/shell.rbuild b/reactos/base/shell/shell.rbuild
index 538c40256bc..efdd8f323e7 100644
--- a/reactos/base/shell/shell.rbuild
+++ b/reactos/base/shell/shell.rbuild
@@ -4,11 +4,9 @@
 	<directory name="cmd">
 		<xi:include href="cmd/cmd.rbuild" />
 	</directory>
-	<ifnot property="ARCH" value="amd64">
-		<directory name="explorer">
-			<xi:include href="explorer/explorer.rbuild" />
-		</directory>
-	</ifnot>
+	<directory name="explorer">
+		<xi:include href="explorer/explorer.rbuild" />
+	</directory>
 	<directory name="explorer-new">
 		<xi:include href="explorer-new/explorer.rbuild" />
 	</directory>