aboutsummaryrefslogtreecommitdiff
path: root/Buildscr
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2021-03-31 18:44:44 +0100
committerSimon Tatham <anakin@pobox.com>2021-03-31 18:44:44 +0100
commit306fab356e357ef13578667b476abce706a55203 (patch)
treeef4707e95236af0ad2e2d32280fd99d24f9fd1a6 /Buildscr
parent76aa9619c07bc1a62fafa99e14dbd187ea9aa565 (diff)
downloadpuzzles-306fab356e357ef13578667b476abce706a55203.zip
puzzles-306fab356e357ef13578667b476abce706a55203.tar.gz
puzzles-306fab356e357ef13578667b476abce706a55203.tar.bz2
puzzles-306fab356e357ef13578667b476abce706a55203.tar.xz
Stop automatically adding warning flags and -Werror.
It's better to be lax for normal users trying to build the puzzles from source to actually run them. That way, warning changes in some particular compiler I haven't seen yet won't break the build. Instead, I've invented a cmake setting -DSTRICT=ON which turns on all those flags. So I can build with them myself, to ensure the code is as portable as possible. And that flag is set in Buildscr, so that my official builds won't complete until that warning mode is satisfied.
Diffstat (limited to 'Buildscr')
-rw-r--r--Buildscr6
1 files changed, 5 insertions, 1 deletions
diff --git a/Buildscr b/Buildscr
index 69cc2d0..29d4e56 100644
--- a/Buildscr
+++ b/Buildscr
@@ -26,7 +26,11 @@ in puzzles do perl -i -pe 's/Unidentified build/$(Version)/' osx/Info.plist
ifneq "$(NOICONS)" yes then
# Run enough of a native Unix build to produce the various icons.
- in . do cmake -B build-icons puzzles
+ # This also checks that the build completes in 'strict' mode (with
+ # lots of warnings and -Werror), and triggers a build failure if
+ # not.
+ in . do cmake -B build-icons puzzles -DSTRICT=ON
+ in build-icons do make -j$(nproc)
in build-icons do make -j$(nproc) icons VERBOSE=1
# Copy the C icon files into the icons source subdirectory, for the