Switch the Windows builds over to clang-cl.

This also switches them to being 64-bit, which I think is
probably acceptable in this modern age, especially for such
a non-essential piece of software. If anyone complains I can
always reinstate a parallel 32-bit build.

To support the switch to 64-bit, this commit also changes the default
install directory in the MSI to 'Program Files' rather than 'Program
Files (x86)'.

diff --git a/Buildscr b/Buildscr
index b548f9b030a368b7b1a02c26a95e8f010e0a6fba..d66150242ff3663f0babfef8f3df9c393cebab53 100644 (file)
--- a/Buildscr
+++ b/Buildscr
@@ -54,22 +54,30 @@ in puzzles do make -f Makefile.doc clean
 in puzzles do make -f Makefile.doc # build help files for installer
 in puzzles do mason.pl --args '{"version":"$(Version)","descfile":"gamedesc.txt"}' winwix.mc > puzzles.wxs
 in puzzles do perl winiss.pl $(Version) gamedesc.txt > puzzles.iss
-delegate windows
-  # FIXME: Cygwin alternative?
-  in puzzles with visualstudio do/win nmake -f Makefile.vc clean
-  in puzzles with visualstudio do/win nmake -f Makefile.vc VER=-DVER=$(Version)
+ifneq "$(VISUAL_STUDIO)" "yes" then
+  in puzzles with clangcl64 do Platform=x64 make -f Makefile.clangcl clean
+  in puzzles with clangcl64 do Platform=x64 make -f Makefile.clangcl VER=-DVER=$(Version)
   # Code-sign the binaries, if the local bob config provides a script
   # to do so. We assume here that the script accepts an -i option to
   # provide a 'more info' URL, and an optional -n option to provide a
   # program name, and that it can take multiple .exe filename
   # arguments and sign them all in place.
-  ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe
+  ifneq "$(cross_winsigncode)" "" in puzzles do $(cross_winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe
   # Build installers.
-  in puzzles with wix do/win candle puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj
-  ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" puzzles.msi Output/installer.exe
-  return puzzles/*.exe
-  return puzzles/puzzles.msi
-enddelegate
+  in puzzles with wixonlinux do candle -arch x64 puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj
+  ifneq "$(cross_winsigncode)" "" in puzzles do $(cross_winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" puzzles.msi
+else
+  delegate windows
+    in puzzles with visualstudio do/win nmake -f Makefile.vc clean
+    in puzzles with visualstudio do/win nmake -f Makefile.vc VER=-DVER=$(Version)
+    ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe
+    # Build installers.
+    in puzzles with wix do/win candle puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj
+    in puzzles with innosetup do/win iscc puzzles.iss
+    return puzzles/*.exe
+    return puzzles/puzzles.msi
+  enddelegate
+endif
 in puzzles do chmod +x *.exe
 
 # Build the Pocket PC binaries and CAB.

diff --git a/winwix.mc b/winwix.mc
index 1a1e620b82185d2f0626fe290cc2a46437402b14..4a72c091230da2ec474009e619107ce07297a581 100644 (file)
--- a/winwix.mc
+++ b/winwix.mc
@@ -61,7 +61,7 @@ has 'descfile' => (required => 1);
 % # (individual files or shortcuts or additions to PATH) that are
 % # installed.
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder" Name="PFiles">
+      <Directory Id="ProgramFiles64Folder" Name="PFiles">
         <Directory Id="INSTALLDIR" Name="Simon Tatham's Portable Puzzle Collection">
 
 % # The following components all install things in the main