Skip to content

Commit

Permalink
Tidy up comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Young committed Jan 19, 2024
1 parent e2c2a65 commit de646ae
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ jobs:
fail-fast: false
matrix:
include: [
# Current installer NSIS with required plugins don't support x64 package
# In the past, we built only 32-bit packages (i686 architecture) on Windows because of problems getting 64-bit
# versions of NSIS plugins to work. However, we now invoke NSIS without plugins, so the 64-bit build seems to
# be working.
#
# As of January 2024, some of the 32-bit MSYS2 packages/groups we were previously relying on previously are no
# longer available. So now, we only build 64-bit packages (x86_64 architecture) on Windows.
{ msystem: MINGW64, arch: x86_64 },
#{ msystem: MINGW32, arch: i686 }
]
Expand Down
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ if(UNIX AND NOT APPLE)

elseif(WIN32)
#============================================ Windows Install Directories ===========================================

set(installSubDir_data "data")
set(installSubDir_doc "doc")
set(installSubDir_bin "bin")
Expand Down Expand Up @@ -392,9 +391,9 @@ message(STATUS "Doing ${CMAKE_BUILD_TYPE} build (DO_RELEASE_BUILD = ${DO_RELEASE
# Note that if you change the minimum Qt version, you need to make corresponding changes to the .github/workflows/*.yml
# files so that GitHub uses the appropriate version of Qt for the automated builds.
#
# For the moment, max version we can have here is 5.9.5, because that's what Ubuntu 18.04 topped out at
# For the moment, max version we can have here is 5.12.8, because that's what Ubuntu 20.04 topped out at
#
set(QT5_MIN_VERSION 5.9.5)
set(QT5_MIN_VERSION 5.12.8)

# Set the AUTOMOC property on all targets. This tells CMake to automatically handle the Qt Meta-Object Compiler (moc)
# preprocessor (ie the thing that handles Qt's C++ extensions), without having to use commands such as QT4_WRAP_CPP(),
Expand Down
10 changes: 9 additions & 1 deletion bt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
# *
# * WINDOWS USERS PLEASE NOTE that, on Windows, we assume you are running in the MSYS2 MINGW32 environment. This is one
# * of, typically, four different environments available to you after installing MSYS2. You must run this script from
# * the "MSYS2 MinGW 32-bit" shell, and not one of the other ones.
# * the "MSYS2 MinGW 64-bit" shell, and not one of the other ones. (As of 2024-01, we no longer support 32-bit builds
# * because some libraries we rely on are no longer available as 32-bit MSYS2 packages.)
# *
# * Additionally on Windows, there are also a couple of extra things you need to do before running this bt script:
# *
Expand Down Expand Up @@ -1737,6 +1738,13 @@ def doPackage():
#
# For the moment, we're sticking with NSIS, which is the devil we know, aka what we've historically used.
#
# In the past, we built only 32-bit packages (i686 architecture) on Windows because of problems getting 64-bit
# versions of NSIS plugins to work. However, we now invoke NSIS without plugins, so the 64-bit build seems to
# be working.
#
# As of January 2024, some of the 32-bit MSYS2 packages/groups we were previously relying on previously are no
# longer available. So now, we only build 64-bit packages (x86_64 architecture) on Windows.
#

#
# As mentioned above, not all information about what Meson does is readily exportable. In particular, I can
Expand Down

0 comments on commit de646ae

Please sign in to comment.