From e1d07af8827a59b1bf9ead0d3afb8ff20cd2c2dc Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Tue, 6 Jun 2006 04:03:50 +0000
Subject: [PATCH] Add manifest for winxp style controls, remove link options
 from stdafx for old broken version of vs.

---
 win32/FireflyShell/FireflyShell.exe.manifest | 8 ++++++++
 win32/FireflyShell/stdafx.h                  | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 win32/FireflyShell/FireflyShell.exe.manifest

diff --git a/win32/FireflyShell/FireflyShell.exe.manifest b/win32/FireflyShell/FireflyShell.exe.manifest
new file mode 100644
index 00000000..e3aaa58f
--- /dev/null
+++ b/win32/FireflyShell/FireflyShell.exe.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>
\ No newline at end of file
diff --git a/win32/FireflyShell/stdafx.h b/win32/FireflyShell/stdafx.h
index 8045052a..7892a721 100644
--- a/win32/FireflyShell/stdafx.h
+++ b/win32/FireflyShell/stdafx.h
@@ -57,6 +57,7 @@ extern CAppModule _Module;
 #define NOTIFY_FOR_THIS_SESSION 0
 #endif
 
+#if _MSC_VER >= 1400
 #if defined _M_IX86
   #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
 #elif defined _M_IA64
@@ -66,6 +67,7 @@ extern CAppModule _Module;
 #else
   #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
 #endif
+#endif
 
 inline void SafeStringCopy(TCHAR *dest, const TCHAR *source, size_t len)
 {