Clean up and expand ranges compat layer

We no longer use the GUI2 draw events. We should implement the appropriate interface provided by top_level_drawable instead. DRAW is still a valid event for now, but would probably be removed in the future.

.clang-tidy

@@ -0,0 +1,4 @@
+---
+Checks:          '-*,modernize-use-nullptr,performance-unnecessary-value-param'
+WarningsAsErrors: true
+...

.github/workflows/ci-main.yml

@@ -41,12 +41,12 @@ jobs:
         if: success() || failure()
         run: doxygen doc/doxygen/Doxyfile
 
-  copyright: # check takes a bit longer and does not need to run in docker
+  copyright: # check takes a bit longer and does not need to run in docker (sound/music only)
     runs-on: ubuntu-latest
     steps:
       - { uses: actions/checkout@v4, with: { fetch-depth: 50 } }
 
-      - name: Copyright check
+      - name: Sound/Music copyright check
         run: ./update_copyrights
 
   ubuntu:
@@ -54,8 +54,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { tool: scons, cc: gcc,   cxx: g++,     cfg: debug,   lto: false, sys_lua: false }
-          - { tool: cmake, cc: clang, cxx: clang++, cfg: release, lto: true,  sys_lua: true  }
+          # the check for WML tests below may need to be adjusted if configurations are changed
+          - { cfg: debug,   tool: scons, cc: gcc,   cxx: g++,     std: 17, lto: false, sys_lua: false }
+          - { cfg: release, tool: cmake, cc: gcc,   cxx: g++,     std: 20, lto: true,  sys_lua: false }
+          - { cfg: release, tool: cmake, cc: clang, cxx: clang++, std: 17, lto: true,  sys_lua: true  }
     runs-on: ubuntu-latest
     container:
       image: wesnoth/wesnoth:2404-master
@@ -65,7 +67,7 @@ jobs:
         CFG: ${{ matrix.cfg }}
         CC: ${{ matrix.cc }}
         CXX: ${{ matrix.cxx }}
-        CXX_STD: 17
+        CXX_STD: ${{ matrix.std }}
         LTO: ${{ matrix.lto }}
         SYS_LUA: ${{ matrix.sys_lua }}
         CLICOLOR_FORCE: 1
@@ -88,10 +90,15 @@ jobs:
                 scons "$@" build="$CFG" ctool="$CC" cxxtool="$CXX" cxx_std="$CXX_STD" \
                   extra_flags_config="-pipe" forum_user_handler=true \
                   nls=false enable_lto="$LTO" system_lua="$SYS_LUA" force_color=true \
-                  jobs=2 --debug=time glibcxx_debug=true glibcxx_assertions=true
+                  jobs=2 --debug=time glibcxx_debug=true glibcxx_assertions=true compile_db=true
               }
               build strict=true wesnoth boost_unit_tests
 
+              build cdb
+              # disable all warnings since we have coverage on them in a standard build, and clang-tidy
+              # triggers false positive compiler warnings that clang itself won't
+              run-clang-tidy -quiet -use-color -j 2 -extra-arg="-w" -warnings-as-errors='*' '^(?!.*src/modules/|.*build/)'
+
               apt remove -y -qq libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev
 
               build strict=false wesnothd campaignd
@@ -102,7 +109,7 @@ jobs:
                 cmake "$@" -DCMAKE_BUILD_TYPE="$CFG" -DCXX_STD="$CXX_STD" \
                   -DEXTRA_FLAGS_CONFIG="-pipe" -DENABLE_MYSQL=true \
                   -DENABLE_NLS=false -DENABLE_LTO="$LTO" -DFORCE_COLOR_OUTPUT=true -DLTO_JOBS=2 \
-                  -DENABLE_SYSTEM_LUA="$SYS_LUA" .
+                  -DENABLE_SYSTEM_LUA="$SYS_LUA -DCLANG_TIDY=true" .
               }
               rm -R /usr/local/lib/cmake
               rm /usr/local/lib/libboost*
@@ -121,20 +128,27 @@ jobs:
         if: success() || steps.build.outcome == 'success'
         run: |
           ./wesnoth --version
-          for opt in data userdata
+          for opt in data userdata usercache
           do
             output=$(./wesnoth --nobanner --"$opt"-path)
             if [ "$output" = "" ]; then printf 'option --%s-path prints nothing to stdout!\n' "$opt" >&2; exit 1; fi
             printf '%s-path: %s\n' "$opt" "$output"
           done
       - name: WML validation
-        # only run on release builds (takes ~10 times as long on debug)
-        if: matrix.cfg == 'release' && (success() || steps.build.outcome == 'success')
+        # only run on release builds (takes ~10 times as long on debug); since there are multiple release builds
+        # but running the following tests multiple times doesn't make much sense use cc==clang as the check
+        if: matrix.cc == 'clang' && (success() || steps.build.outcome == 'success')
         run: ./utils/CI/schema_validation.sh
       - name: Run WML tests
         # only run on release builds (takes ~6 times as long on debug)
-        if: matrix.cfg == 'release' && (success() || steps.build.outcome == 'success')
-        run: ./run_wml_tests -g -c -t 20 -bt 1000
+        if: matrix.cc == 'clang' && (success() || steps.build.outcome == 'success')
+        run: ./run_wml_tests -v -v -g -c -t 20 -bt 1000 -a=--userdata-dir=ud
+      - name: Upload userdata files from WML unit tests (logs, replays)
+        if: matrix.cc == 'clang' && (success() || failure())
+        uses: actions/upload-artifact@v4
+        with:
+          name: WMLTest-userdata-Linux
+          path: ud
       - name: Run play tests
         if: success() || steps.build.outcome == 'success'
         run: ./utils/CI/play_test_executor.sh
@@ -249,8 +263,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfg: [ Debug, Release ]
-    runs-on: macos-12
+        cfg: [ Release ]
+    runs-on: macos-13
     env:
       CFG: ${{ matrix.cfg }}
 
@@ -274,6 +288,7 @@ jobs:
           [ -x "build/$CFG/unit_tests" ] || { printf 'Failed to build unit test executable!\n' >&2; exit 1; }
       - name: Create disk image
         working-directory: projectfiles/Xcode
+        continue-on-error: true  # allow failures since this is not essential and it does fail spuriously (hdiutil: create failed - Resource busy)
         run: hdiutil create -volname "Wesnoth_$CFG" -fs 'HFS+' -srcfolder "build/$CFG" -ov -format UDBZ "Wesnoth_${CFG}.dmg"
       - name: Upload disk image
         uses: actions/upload-artifact@v4
@@ -282,7 +297,13 @@ jobs:
           path: projectfiles/Xcode/Wesnoth_${{ matrix.cfg }}.dmg
       - name: Run WML tests
         if: matrix.cfg == 'Release'
-        run: ./run_wml_tests -g -c -t 30 -p "projectfiles/Xcode/build/$CFG/The Battle for Wesnoth.app/Contents/MacOS/The Battle for Wesnoth"
+        run: ./run_wml_tests -g -c -t 30 -bt 350 -p "projectfiles/Xcode/build/$CFG/The Battle for Wesnoth.app/Contents/MacOS/The Battle for Wesnoth" -a=--userdata-dir="$PWD/ud"
+      - name: Upload userdata files from WML unit tests (logs, replays)
+        if: matrix.cfg == 'Release' && (success() || failure())
+        uses: actions/upload-artifact@v4
+        with:
+          name: WMLTest-userdata-MacOS
+          path: ud
       - name: Run unit tests
         run: ./run_boost_tests --path=projectfiles/Xcode/build/"$CFG" --executable=unit_tests
 
@@ -290,7 +311,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfg: [Debug, Release]
+        cfg: [Release]
     env:
       CFG: ${{ matrix.cfg }}
       VCPKG_FEATURE_FLAGS: dependencygraph
@@ -299,7 +320,7 @@ jobs:
     defaults:
       run:
         shell: cmd
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
       - { uses: actions/checkout@v4, with: { submodules: "recursive" } }
@@ -322,14 +343,21 @@ jobs:
         run: cmake -DCMAKE_BUILD_TYPE=%CFG% -DENABLE_GAME=true -DENABLE_SERVER=true -DENABLE_CAMPAIGN_SERVER=true
           -DENABLE_TESTS=true -DENABLE_MYSQL=false -DENABLE_NLS=false
           -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_INSTALL_OPTIONS=--debug
-          -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_GENERATOR_PLATFORM=x64 -G "Visual Studio 16 2019" .
+          -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_GENERATOR_PLATFORM=x64 -G "Visual Studio 17 2022" .
 
       - name: Build wesnoth, wesnothd, campaignd and unit tests
         run: MSBuild.exe wesnoth.sln -p:Configuration=%CFG%
 
       - name: Run WML unit tests
         if: matrix.cfg == 'Release'
-        run: python run_wml_tests -v -g -c -t 20 -p %CFG%/wesnoth.exe
+        run: python run_wml_tests -v -g -c -t 20 -p %CFG%/wesnoth.exe -a=--userdata-dir=ud
+
+      - name: Upload userdata files from WML unit tests (logs, replays)
+        if: matrix.cfg == 'Release' && (success() || failure())
+        uses: actions/upload-artifact@v4
+        with:
+          name: WMLTest-userdata-Windows
+          path: ud
 
 # run after all other jobs have completed to check overall build status
   notification:

.github/workflows/codeql.yml

@@ -16,7 +16,7 @@ jobs:
     #   - https://gh.io/supported-runners-and-hardware-resources
     #   - https://gh.io/using-larger-runners
     # Consider using larger runners for possible analysis time improvements.
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 360
     permissions:
       actions: read
@@ -50,11 +50,12 @@ jobs:
     - name: Install dependencies
       if: matrix.language == 'cpp'
       run: |
+        utils/autorevision.sh -t h > src/revision.h
         sudo apt update
-        sudo apt install scons libboost-system1.74-dev libboost-filesystem1.74-dev libboost-iostreams1.74-dev \
-          libboost-serialization1.74-dev libboost-locale1.74-dev libboost-regex1.74-dev libboost-random1.74-dev \
-          libboost-program-options1.74-dev libboost-thread1.74-dev libboost-context1.74-dev libboost-test-dev \
-          libboost-coroutine1.74-dev libboost-graph1.74-dev libasio-dev libsdl2-dev libsdl2-image-dev \
+        sudo apt install scons libboost-system1.83-dev libboost-filesystem1.83-dev libboost-iostreams1.83-dev \
+          libboost-serialization1.83-dev libboost-locale1.83-dev libboost-regex1.83-dev libboost-random1.83-dev \
+          libboost-program-options1.83-dev libboost-thread1.83-dev libboost-context1.83-dev libboost-test-dev \
+          libboost-coroutine1.83-dev libboost-graph1.83-dev libasio-dev libsdl2-dev libsdl2-image-dev \
           libsdl2-mixer-dev libvorbis-dev libpango1.0-dev libssl-dev libcurl4-openssl-dev liblua5.4-dev
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     - name: Autobuild

.github/workflows/image_metadata.yml

@@ -0,0 +1,88 @@
+name: Image metadata check CI
+
+on:
+  push:
+    branches: [ master ]
+    paths: [ '**.webp', '**.png', '**.jpg', '**.jpeg' ]
+  pull_request:
+    paths: [ '**.webp', '**.png', '**.jpg', '**.jpeg' ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Image Metadata
+    runs-on: ubuntu-latest
+    env:
+      BASE_SHA: ${{ github.event_name == 'push' && github.event.before || github.event.pull_request.base.sha }}
+      HEAD_SHA: ${{ github.event_name == 'push' && github.event.after  || github.event.pull_request.head.sha }}
+
+    steps:
+      - name: exiftool installation
+        run: |
+          sudo apt-get install --assume-yes exiftool
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: check image EXIF metadata
+        run: |
+          mapfile -t image_files < <(git diff --name-only --diff-filter=d "$BASE_SHA" "$HEAD_SHA" | grep -E '\.(webp|je?pg)$')
+          # cycle through the changed image files, make sure they have the right fields
+          for file in "${image_files[@]}"; do
+            # check Artist tag, fail if missing
+            artist="$(exiftool -p '$Artist' "$file")"
+            if [ "$artist" ]; then
+              printf 'Artist tag in %s is %s\n' "$file" "$artist"
+            else
+              printf 'no Artist EXIF tag in %s\n' "$file"
+              exit 1
+            fi
+            # check Copyright tag, fail if missing or wrong type
+            copyright="$(exiftool -p '$Copyright' "$file")"
+            case $copyright in
+              'GNU GPL v2+'|'CC BY-SA 4.0'|CC0)
+                printf 'Copyright tag in %s is %s\n' "$file" "$copyright"
+                ;;
+              '')
+                printf 'no Copyright EXIF tag in %s\n' "$file"
+                exit 1
+                ;;
+              *)
+                printf 'Copyright tag %s in file %s is not an accepted license! Must be one of: "GNU GPL v2+", "CC BY-SA 4.0", "CC0"\n' "$copyright" "$file"
+                exit 1
+                ;;
+            esac
+          done
+
+      - name: check png XMP metadata
+        run: |
+          mapfile -t image_files < <(git diff --name-only --diff-filter=d "$BASE_SHA" "$HEAD_SHA" | grep -E '\.png$')
+          # cycle through the changed image files, make sure they have the right fields
+          for file in "${image_files[@]}"; do
+            # check Creator tag, fail if missing
+            artist="$(exiftool -p '$XMP:Creator' "$file")"
+            if [ "$artist" ]; then
+              printf 'Creator tag in %s is %s\n' "$file" "$artist"
+            else
+              printf 'no Creator XMP tag in %s\n' "$file"
+              exit 1
+            fi
+            # check Rights tag, fail if missing or wrong type
+            copyright="$(exiftool -p '$XMP:Rights' "$file")"
+            case $copyright in
+              'GNU GPL v2+'|'CC BY-SA 4.0'|CC0)
+                printf 'Rights tag in %s is %s\n' "$file" "$copyright"
+                ;;
+              '')
+                printf 'no Rights XMP tag in %s\n' "$file"
+                exit 1
+                ;;
+              *)
+                printf 'Rights tag %s in file %s is not an accepted license! Must be one of: "GNU GPL v2+", "CC BY-SA 4.0", "CC0"\n' "$copyright" "$file"
+                exit 1
+                ;;
+            esac
+          done

.gitignore

@@ -127,6 +127,7 @@ wesnoth.plg
 *.exe
 *.dll
 *.so
+compile_commands.json
 
 # library files
 .libs

CMakeLists.txt

@@ -1,4 +1,4 @@
-# set minimum version
+# set minimum version
 cmake_minimum_required(VERSION 3.14)
 
 project(wesnoth)
@@ -171,6 +171,7 @@ option(GLIBCXX_ASSERTIONS "Whether to define _GLIBCXX_ASSERTIONS" OFF)
 option(GLIBCXX_DEBUG "Whether to define _GLIBCXX_DEBUG and _GLIBCXX_DEBUG_PEDANTIC. Requires a version of Boost's program_options that's compiled with __GLIBCXX_DEBUG too." OFF)
 option(ENABLE_POT_UPDATE_TARGET "Enables the tools to update the pot files and manuals. This target has extra dependencies." OFF)
 option(FORCE_COLOR_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." FALSE)
+option(CLANG_TIDY "Enable clang-tidy linter checks." OFF)
 
 if(UNIX AND NOT APPLE AND NOT CYGWIN)
 	option(ENABLE_NOTIFICATIONS "Enable Window manager notification messages" ON)
@@ -255,6 +256,11 @@ if(NOT MSVC)
 		endif()
 	endif()
 
+### Enable clang-tidy linting
+	if (CLANG_TIDY)
+		set(CMAKE_CXX_CLANG_TIDY "clang-tidy -Wno-unknown-warning-option")
+	endif()
+
 ### Set the final compiler flags.
 
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} ${CXX_FLAGS_USER}")
@@ -474,7 +480,7 @@ if(NOT MSVC)
 else()
 	set(CMAKE_CXX_FLAGS "/W3 /WX /wd4503 /wd4351 /wd4250 /wd4244 /wd4267 /we4239 /wd4275 /EHsc /utf-8 /Zc:__cplusplus" CACHE STRING "Global flags used by the CXX compiler during all builds." FORCE)
 	set(CMAKE_C_FLAGS "/WX" CACHE STRING "Global flags used by the C compiler during all builds." FORCE)
-	add_definitions(-D_WIN32_WINNT=0x0601 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -DNOMINMAX)
+	add_definitions(-D_WIN32_WINNT=0x0A00 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -DNOMINMAX)
 
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG_LUA")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")

INSTALL.md

@@ -2,7 +2,7 @@
 
 ## Prerequisites
 
-Wesnoth requires a compiler with sufficient C++17 support such as GCC 8 and
+Wesnoth requires a compiler with sufficient C++17 support such as GCC 11 and
 later, or a version of Clang with equivalent support.
 
 You'll need to have these libraries and their development headers installed in
@@ -19,6 +19,7 @@ order to build Wesnoth:
    * System
    * Coroutine
    * Graph
+   * Charconv (This requires boost 1.85 or higher and is optional but reccomended especially for clang builds)
  * SDL2 libraries:
    * SDL2                      >= 2.0.18 (macOS: 2.0.22 due to needing https://github.com/libsdl-org/SDL/commit/3bebdaccb7bff8c40438856081d404a7ce3def30)
    * SDL2_image                >= 2.0.2 (with PNG, JPEG, and WEBP support)

SConstruct

@@ -120,6 +120,7 @@ opts.AddVariables(
     BoolVariable("OS_ENV", "Forward the entire OS environment to scons", False),
     BoolVariable("history", "Clear to disable GNU history support in lua console", True),
     BoolVariable('force_color', 'Always produce ANSI-colored output (GNU/Clang only).', False),
+    BoolVariable('compile_db', 'Produce a compile_commands.json file.', False),
     )
 
 #
@@ -189,6 +190,11 @@ if env['distcc']:
 
 if env['ccache']: env.Tool('ccache')
 
+if env['compile_db']:
+    env.Tool('compilation_db')
+    cdb = env.CompilationDatabase()
+    Alias('cdb', cdb)
+
 boost_version = "1.67"
 
 def SortHelpText(a, b):
@@ -379,6 +385,7 @@ if env["prereqs"]:
         conf.CheckBoost("program_options", require_version = boost_version) & \
         conf.CheckBoost("random", require_version = boost_version) & \
         conf.CheckBoost("smart_ptr", header_only = True) & \
+        conf.CheckBoostCharconv() & \
 	CheckAsio(conf) & \
 	conf.CheckBoost("thread") & \
         conf.CheckBoost("locale") & \
@@ -665,7 +672,7 @@ for env in [test_env, client_env, env]:
         env[d] = os.path.join(env["prefix"], env[d])
 
     if env["PLATFORM"] == 'win32':
-        env.Append(LIBS = ["wsock32", "crypt32", "iconv", "z", "shlwapi", "winmm", "ole32", "uuid"], CCFLAGS = ["-mthreads"], LINKFLAGS = ["-mthreads"], CPPDEFINES = ["_WIN32_WINNT=0x0601"])
+        env.Append(LIBS = ["wsock32", "crypt32", "iconv", "z", "shlwapi", "winmm", "ole32", "uuid"], CCFLAGS = ["-mthreads"], LINKFLAGS = ["-mthreads"], CPPDEFINES = ["_WIN32_WINNT=0x0A00"])
 
     if env["PLATFORM"] == 'darwin':            # Mac OS X
         env.Append(FRAMEWORKS = "Cocoa")            # Cocoa GUI

add_source_file

@@ -81,7 +81,7 @@ code_blocks_target_translations = {
 # XCode #
 #=======#
 
-def add_to_xcode(filename, targets):
+def modify_xcode(filename, targets, remove):
     """Add the given file to the specified targets.
     """
     projectfile = rootdir.joinpath(
@@ -121,24 +121,29 @@ def add_to_xcode(filename, targets):
             raise Exception(f"problem finding '{d}' group in '{groupname}'")
         parent_group = found_groups[0]
 
-    # if the group already has an entry with the same filename, loudly skip.
-    # note: this doesn't allow adding to targets one at a time.
-    # a new file should be added to all targets at once...
-    # or maybe targets could be checked somehow,
-    # or maybe the file could simply be completely removed and readded.
-    if project.get_files_by_name(filename.name, parent=parent_group):
-        print("  '"+filename.name+"' already found in Xcode project '"+",".join(translated_targets)+"', skipping")
-        return
+    if remove :
+        # Remove from all targets if we want to remove
+        for file in project.get_files_by_name(filename.name, parent=parent_group):
+            project.remove_file_by_id(file.get_id())
+    else:
+        # if the group already has an entry with the same filename, loudly skip.
+        # note: this doesn't allow adding to targets one at a time.
+        # a new file should be added to all targets at once...
+        # or maybe targets could be checked somehow,
+        # or maybe the file could simply be completely removed and readded.
+        if project.get_files_by_name(filename.name, parent=parent_group):
+            print("  '"+filename.name+"' already found in Xcode project '"+",".join(translated_targets)+"', skipping")
+            return
 
-    # force is True here because otherwise a duplicate filename in
-    # a different place will block addition of the new file.
-    # the rest is just to match existing project file structure.
-    project.add_file(filename.name,
-        force=True,
-        tree="<group>",
-        parent=parent_group,
-        target_name=translated_targets,
-    )
+        # force is True here because otherwise a duplicate filename in
+        # a different place will block addition of the new file.
+        # the rest is just to match existing project file structure.
+        project.add_file(filename.name,
+            force=True,
+            tree="<group>",
+            parent=parent_group,
+            target_name=translated_targets,
+        )
 
     # that's done, save the file
     project.save()
@@ -148,7 +153,7 @@ def add_to_xcode(filename, targets):
 # source_lists #
 #==============#
 
-def add_to_source_list(filename, source_list):
+def modify_source_list(filename, source_list, remove):
     source_list_file = rootdir.joinpath("source_lists", source_list)
     sl_lines = open(source_list_file).readlines()
     file_line = filename.as_posix() + '\n'
@@ -157,12 +162,16 @@ def add_to_source_list(filename, source_list):
     if filename.suffix != ".cpp":
         return
 
-    # if the target already has an entry with the same filename, loudly skip
-    if file_line in sl_lines:
-        print(f"  '{filename}' already found in '{source_list}', skipping")
-        return
+    if remove:
+        if file_line in sl_lines: sl_lines.remove(file_line)
+    else:
+        # if the target already has an entry with the same filename, loudly skip
+        if file_line in sl_lines:
+            print(f"  '{filename}' already found in '{source_list}', skipping")
+            return
+
+        sl_lines.append(file_line)
 
-    sl_lines.append(file_line)
     sl_lines.sort()
     open(source_list_file, 'w').writelines(sl_lines)
 
@@ -170,13 +179,18 @@ def add_to_source_lists(filename, targets):
     translated_targets = [source_list_target_translations[t] for t in targets]
     print(" source_list targets:", translated_targets)
     for t in translated_targets:
-        add_to_source_list(filename, t)
+        modify_source_list(filename, t, False)
+
+def remove_from_source_lists(filename):
+    # remove from all tagerts if -r was specified.
+    for t in source_list_target_translations.values():
+        modify_source_list(filename, t, True)
 
 #==============#
 # Code::Blocks #
 #==============#
 
-def add_to_code_blocks_target(filename, target):
+def modify_code_blocks_target(filename, target, remove):
     cbp_file = rootdir.joinpath(
         "projectfiles",
         "CodeBlocks",
@@ -190,30 +204,33 @@ def add_to_code_blocks_target(filename, target):
 
     elem = f"\t\t<Unit filename=\"{filename_for_cbp}\" />\n"
 
-    # if the target already has an entry with the same filename, loudly skip
-    if elem in cbp_lines:
-        print(f"  '{filename}' already found in '{target}.cbp', skipping")
-        return
+    if remove:
+        if elem in cbp_lines: cbp_lines.remove(elem)
+    else:
+        # if the target already has an entry with the same filename, loudly skip
+        if elem in cbp_lines:
+            print(f"  '{filename}' already found in '{target}.cbp', skipping")
+            return
 
-    # find an appropriate line to add before/after
-    index = 0
-    for line in cbp_lines:
-        if line.startswith("\t\t<Unit "):
-            if elem < line:
+        # find an appropriate line to add before/after
+        index = 0
+        for line in cbp_lines:
+            if line.startswith("\t\t<Unit "):
+                if elem < line:
+                    break
+            elif line.startswith("\t\t<Extensions>"):
+                # we must be the last entry, as this comes after the Unit section
                 break
-        elif line.startswith("\t\t<Extensions>"):
-            # we must be the last entry, as this comes after the Unit section
-            break
-        index += 1
-    cbp_lines.insert(index, elem)
+            index += 1
+        cbp_lines.insert(index, elem)
 
     open(cbp_file, 'w').writelines(cbp_lines)
 
-def add_to_code_blocks(filename, targets):
-    translated_targets = [code_blocks_target_translations[t] for t in targets]
+def modify_code_blocks(filename, targets, remove):
+    translated_targets = code_blocks_target_translations.values() if remove else [code_blocks_target_translations[t] for t in targets]
     print(" code::blocks targets:", translated_targets)
     for t in translated_targets:
-        add_to_code_blocks_target(filename, t)
+        modify_code_blocks_target(filename, t, remove)
 
 def sanity_check_existing_cpp_hpp(filenames):
     """
@@ -285,6 +302,8 @@ if __name__ == "__main__":
         help="which build targets to add the file to")
     ap.add_argument("--no-checks", action="store_true",
         help="do not check whether the files exist, etc")
+    ap.add_argument("-r", "--remove", action="store_true",
+        help="remove the specified files from projectfiles instead of adding them, --target is then ignored")
     # By default, recognise --help too
     options = ap.parse_args()
 
@@ -301,7 +320,13 @@ if __name__ == "__main__":
         sanity_check_existing_cpp_hpp(filenames)
 
     for filename in filenames:
-        print(f"adding '{filename}' to targets: {options.target}")
-        add_to_xcode(filename, options.target)
-        add_to_source_lists(filename, options.target)
-        add_to_code_blocks(filename, options.target)
+        if options.remove:
+            print(f"removing '{filename}' from all targets")
+            modify_xcode(filename, options.target, True)
+            remove_from_source_lists(filename)
+            modify_code_blocks(filename, options.target, True)
+        else:
+            print(f"adding '{filename}' to targets: {options.target}")
+            modify_xcode(filename, options.target, False)
+            add_to_source_lists(filename, options.target)
+            modify_code_blocks(filename, options.target, False)