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

diff --git a/win/vncviewer/vncviewer.exe.manifest64 b/win/vncviewer/vncviewer.exe.manifest64
new file mode 100644 (file)
index 0000000..287a991
--- /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 871ccd6c608b3442663603b53401cc785dc3e00c..076d5b8b54bc3613b8580a83d1d505cbb5f852cc 100644 (file)
--- 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
 
 /////////////////////////////////////////////////////////////////////////////
 //