aboutsummaryrefslogtreecommitdiffstats
path: root/win/vncviewer
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2010-05-20 17:13:16 +0000
committerDRC <dcommander@users.sourceforge.net>2010-05-20 17:13:16 +0000
commit61cc2a02a68e915b3bf0c35d22085e0e133fc93a (patch)
tree23b3ea47c43ba87718730812c122a2fe1f164cab /win/vncviewer
parentc75dc44cea1877d8ec3783fb5201a2ba0f4a8d83 (diff)
downloadtigervnc-61cc2a02a68e915b3bf0c35d22085e0e133fc93a.tar.gz
tigervnc-61cc2a02a68e915b3bf0c35d22085e0e133fc93a.zip
vncviewer now successfully runs on Windows/x64. And there was much rejoicing (yay...)
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4062 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win/vncviewer')
-rw-r--r--win/vncviewer/vncviewer.exe.manifest6422
-rw-r--r--win/vncviewer/vncviewer.rc4
2 files changed, 26 insertions, 0 deletions
diff --git a/win/vncviewer/vncviewer.exe.manifest64 b/win/vncviewer/vncviewer.exe.manifest64
new file mode 100644
index 00000000..287a991d
--- /dev/null
+++ b/win/vncviewer/vncviewer.exe.manifest64
@@ -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="4.0.0.26"
+ processorArchitecture="AMD64"
+ name="TigerVNC.vncviewer.exe"
+ type="win32"
+/>
+<description>.NET control deployment tool</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/win/vncviewer/vncviewer.rc b/win/vncviewer/vncviewer.rc
index 871ccd6c..076d5b8b 100644
--- a/win/vncviewer/vncviewer.rc
+++ b/win/vncviewer/vncviewer.rc
@@ -534,7 +534,11 @@ END
// 24
//
+#ifdef _WIN64
+IDR_MANIFEST 24 DISCARDABLE "vncviewer.exe.manifest64"
+#else
IDR_MANIFEST 24 DISCARDABLE "vncviewer.exe.manifest"
+#endif
/////////////////////////////////////////////////////////////////////////////
//