From 62a4bb7718eb4ca9e4d8357ef3d82932b72c4353 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Sat, 2 Oct 2010 13:49:37 +0000
Subject: [PATCH] Fix error in vc9: don't include manifest, newer versions of
 msvs do this automatically, which leads to conflicts

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1509 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/resource/msw/mse.rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/resource/msw/mse.rc b/src/resource/msw/mse.rc
index 2afca012..1991cf89 100644
--- a/src/resource/msw/mse.rc
+++ b/src/resource/msw/mse.rc
@@ -216,8 +216,8 @@ FILETYPE VFT_APP
   }
 }
 
-#if !defined(__WIN64__)
+#if !defined(_MSC_VER) || _MSC_VER < 1400
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
-1 24 "wx/msw/wx.manifest"
+//1 24 "wx/msw/wx.manifest"
 #endif
 #endif