Undocument 32-bit Windows support

TurboVNC 3.2 will no longer provide 32-bit Windows packages. Windows 10 no longer supports 32-bit-only x86 CPUs, and Windows 11 never did. Referring to https://turbovnc.org/Documentation/OSSupport, it is expected that the community will report any incompatibilities between TurboVNC and 32-bit-only operating systems, as well as assist in diagnosing and fixing such incompatibilities. In other words, TurboVNC may work with 32-bit-only operating systems, but we no longer claim that it does. This commit also removes the 32-bit Windows build from the AppVeyor script, since the previous commit broke it anyhow.
TurboVNC · Jan 31, 2024 · 61b896c · 61b896c
1 parent 1ff6858
commit 61b896c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 42 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -52,13 +52,12 @@ Build Requirements
   which includes everything necessary to build TurboVNC.
 
   * You can also download and install the standalone Windows SDK (for Windows 7
-    or later), which includes command-line versions of the 32-bit and 64-bit
-    Visual C++ compilers.
+    or later), which includes a command-line version of the Visual C++
+    compiler.
   * If you intend to build TurboVNC from the command line, then add the
     appropriate compiler and SDK directories to the `INCLUDE`, `LIB`, and
     `PATH` environment variables.  This is generally accomplished by executing
-    `vcvars32.bat` or `vcvars64.bat`, which are located in the same directory
-    as the compiler.
+    `vcvars64.bat`, which is located in the same directory as the compiler.
 
    ... OR ...
 
@@ -130,9 +129,6 @@ Replace `make` with `ninja` and `Unix Makefiles` with `Ninja` if using Ninja.
     cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release [additional CMake flags] {source_directory}
     nmake
 
-This will build either a 32-bit or a 64-bit version of TurboVNC, depending on
-which version of __cl.exe__ is in the `PATH`.
-
 Replace `nmake` with `ninja` and `NMake Makefiles` with `Ninja` if using Ninja.
 
 
@@ -143,13 +139,9 @@ Choose the appropriate CMake generator option for your version of Visual Studio
 instance:
 
     cd {build_directory}
-    cmake -G"Visual Studio 10" [additional CMake flags] {source_directory}
-
-NOTE: Add `Win64` to the generator name (for example, `Visual Studio 10 Win64`)
-to build a 64-bit version of TurboVNC.  A separate build directory must be
-used for 32-bit and 64-bit builds.
+    cmake -G "Visual Studio 17 2022" [additional CMake flags] {source_directory}
 
-You can then open __ALL_BUILD.vcproj__ in Visual Studio and build one of the
+You can then open __ALL_BUILD.vcxproj__ in Visual Studio and build one of the
 configurations in that project ("Debug", "Release", etc.) to generate a full
 build of TurboVNC.
 
@@ -242,9 +234,6 @@ TurboVNC into a directory of your choosing.  If you don't specify
 __c:\Program Files\TurboVNC__<br>
 Windows
 
-__c:\Program Files (x86)\TurboVNC__<br>
-32-bit build on 64-bit Windows
-
 __/opt/TurboVNC__<br>
 Un*x
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,6 @@ image: Visual Studio 2022
 environment:
   LJT_VERSION: 3.0.2
   LJT_64BIT_SDK: "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LJT_VERSION%/libjpeg-turbo-%LJT_VERSION%-vc64.exe"
-  LJT_32BIT_SDK: "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LJT_VERSION%/libjpeg-turbo-%LJT_VERSION%-vc.exe"
 
 install:
   - cmd: >-
@@ -17,10 +16,6 @@ install:
 
       c:\installers\libjpeg-turbo-vc64.exe /S
 
-      curl -fSL -o c:\installers\libjpeg-turbo-vc.exe "%LJT_32BIT_SDK%"
-
-      c:\installers\libjpeg-turbo-vc.exe /S
-
       call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
 
       set PATH=c:\Program Files (x86)\Inno Setup 6;c:\msys64\usr\bin;%PATH%

diff --git a/cmakescripts/BuildPackages.cmake b/cmakescripts/BuildPackages.cmake
@@ -88,11 +88,9 @@ endif() # Linux
 
 if(WIN32)
 
+set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
 if(BITS EQUAL 64)
-	set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-x64)
 	set(INST_DEFS -DWIN64)
-else()
-	set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-x86)
 endif()
 
 set(INST_DEPENDS java turbovnchelper)

diff --git a/doc/index.html b/doc/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 <meta name="language" content="en">
-<meta name="date" content="2023-12-01T16:11:12">
+<meta name="date" content="2024-01-31T17:47:05">
 <meta name="generator" content="deplate.rb 0.8.5">
 <title>User&rsquo;s Guide for TurboVNC 3.2</title>
 <link rel="start" href="index.html" title="Frontpage">
@@ -533,7 +533,7 @@ <h2 id="hd004003">4.3&nbsp;Windows</h2>
   </thead>
   <tr class="standard">
     <td class="high standard">CPU</td>
-    <td class="standard">For optimal performance, the CPU should support SSE2 extensions.</td>
+    <td class="standard">x86-64 required</td>
   </tr>
   <tr class="standard">
     <td class="high standard">O/S</td>
@@ -674,9 +674,7 @@ <h2 id="hd005003">5.3&nbsp;Installing the TurboVNC Viewer on Windows</h2>
 <ol class="Ordered numeric">
     <li class="Ordered-1 Ordered">
         Download the TurboVNC Windows installer package 
-        (<strong class="filename">TurboVNC-3.1.80-x64.exe</strong> for 64-bit 
-        systems or <strong class="filename">TurboVNC-3.1.80-x86.exe</strong> for 
-        legacy 32-bit-only systems) from the 
+        (<strong class="filename">TurboVNC-3.1.80.exe</strong>) from the 
         <span class="remote"><a href="https://github.com/TurboVNC/turbovnc/releases" class="remote">Releases 
         area</a></span><a name="idx0016"></a> of the 
         <span class="remote"><a href="https://github.com/TurboVNC/turbovnc" class="remote">TurboVNC 

diff --git a/doc/install.txt b/doc/install.txt
@@ -82,10 +82,9 @@ Add {file: ~/turbovnc} to any paths specified in this document.
 ** Installing the TurboVNC Viewer on Windows
 
 	#. Download the TurboVNC Windows installer package
-		({file: TurboVNC-{val: _VERSION}-x64.exe} for 64-bit systems or
-		{file: TurboVNC-{val: _VERSION}-x86.exe} for legacy 32-bit-only systems)
-		from the [[https://github.com/TurboVNC/turbovnc/releases][Releases area]]
-		of the [[https://github.com/TurboVNC/turbovnc][TurboVNC GitHub project page]].
+		({file: TurboVNC-{val: _VERSION}.exe}) from the
+		[[https://github.com/TurboVNC/turbovnc/releases][Releases area]] of the
+		[[https://github.com/TurboVNC/turbovnc][TurboVNC GitHub project page]].
 
 	#. Run the TurboVNC installer.  The installation of TurboVNC should be
 		self-explanatory.  The only configuration option is the directory into

diff --git a/doc/sysreq.txt b/doc/sysreq.txt
@@ -49,7 +49,7 @@
 
 || || Client ||
 | CPU \
-	| For optimal performance, the CPU should support SSE2 extensions. \
+	| x86-64 required \
 	|
 | O/S \
 	| Windows 7 or later \

diff --git a/release/installer.iss.in b/release/installer.iss.in
@@ -4,23 +4,16 @@
 [Setup]
 #ifdef WIN64
 ArchitecturesInstallIn64BitMode=x64
-AppName=@CMAKE_PROJECT_NAME@ 64-bit
-AppVerName=@CMAKE_PROJECT_NAME@ 64-bit v@VERSION@ (@BUILD@)
-#else
+#endif
 AppName=@CMAKE_PROJECT_NAME@
 AppVerName=@CMAKE_PROJECT_NAME@ v@VERSION@ (@BUILD@)
-#endif
 AppVersion=@VERSION@
 AppPublisher=@PKGVENDOR@
 AppPublisherURL=@PKGURL@
 AppSupportURL=@PKGURL@
 AppUpdatesURL=@PKGURL@
 DefaultDirName={pf}\@CMAKE_PROJECT_NAME@
-#ifdef WIN64
-DefaultGroupName=@CMAKE_PROJECT_NAME@ 64-bit
-#else
 DefaultGroupName=@CMAKE_PROJECT_NAME@
-#endif
 AllowNoIcons=yes
 InfoBeforeFile=@CMAKE_SOURCE_DIR@\release\InstInfo.rtf
 Compression=zip/9