- 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
This commit is contained in:
Samuel Serapion
2009-11-13 09:24:35 +00:00
parent 2c2f893be1
commit 321196255a
4 changed files with 29 additions and 6 deletions
@@ -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>
@@ -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">
@@ -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"
+3 -5
View File
@@ -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>