[sserapion] 44124: - re-add explorer (old one) to build, it builds. - use amd64 specific manifest file. - still not a valid exe according to windows 7

Author: sserapion
Date: Fri Nov 13 10:24:35 2009
New Revision: 44124

URL: http://svn.reactos.org/svn/reactos?rev=44124&view=rev
Log:
- re-add explorer (old one) to build, it builds.
- use amd64 specific manifest file.
- still not a valid exe according to windows 7

Added:
    branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest   (with props)
Modified:
    branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild
    branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer_intres.rc
    branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild

Added: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s...
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest (added)
+++ branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest [iso-8859-1] Fri Nov 13 10:24:35 2009
@@ -1,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>

Propchange: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.exe.amd64.manifest
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s...
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Fri Nov 13 10:24:35 2009
@@ -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">

Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer_intres.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s...
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] Fri Nov 13 10:24:35 2009
@@ -104,7 +104,11 @@
     "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"

Modified: branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s...
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] Fri Nov 13 10:24:35 2009
@@ -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>