.gitattributes

@@ -1 +0,0 @@
-sample_project text eol=lf

.gitignore

@@ -6,14 +6,12 @@
 .mypy_cache
 .stfolder
 .stignore
-.vs
 util/scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs
 Session.vim
 build
-cmake-build-*
 compile_commands.json
 dist
 graph_info.json

deps/buildcore/scripts/pybb.py

@@ -11,7 +11,6 @@
 # "Python Busy Box" - adds cross-platform equivalents to Unix commands that
 #                     don't translate well to that other operating system
 
-import multiprocessing
 import os
 import platform
 import shutil
@@ -58,11 +57,7 @@ def cmake_build(base_path: str, target: Optional[str]) -> int:
         path = os.path.join(base_path, d)
         if not os.path.isdir(path):
             continue
-        args = ['cmake', '--build', path, f'-j{multiprocessing.cpu_count()}']
+        args = ['cmake', '--build', path]
-        if path.endswith('release'):
-            args.append('--config=release')
-        elif path.endswith('debug'):
-            args.append('--config=debug')
         if target is not None:
             args.extend(['--target', target])
         err = subprocess.run(args).returncode

deps/ox/src/ox/fs/filesystem/filelocation.hpp

@@ -24,6 +24,9 @@ enum class FileAddressType: int8_t {
 	Inode,
 };
 
+template<typename T>
+constexpr Error model(T *h, CommonPtrWith<class FileAddress> auto *fa) noexcept;
+
 class FileAddress {
 
 	template<typename T>

deps/teagba/src/cstartup.cpp

@@ -2,8 +2,6 @@
  * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#ifdef __GNUC__
-
 #include <ox/std/heapmgr.hpp>
 
 #include <teagba/bios.hpp>
@@ -60,5 +58,3 @@ int c_start() {
 }
 
 }
-
-#endif

release-notes.md

@@ -2,12 +2,6 @@
 
 * PaletteEditor: Add RGB key shortcuts for focusing color channels
 
-# d2025.05.1
-
-* TileSheetEditor: Fix overrun errors when switching subsheets, clear selection
-  on switch (261e324acd)
-* Fix new build error that occurs in MSVC (26d5048e6720c4c2d52508a6ee44c67dd9fe3ee5)
-
 # d2025.05.0
 
 * Add app icon for both window and file

src/nostalgia/modules/gfx/include/nostalgia/gfx/tilesheet.hpp

@@ -336,7 +336,7 @@ struct TileSheetV5 {
 [[nodiscard]]
 constexpr bool valid(TileSheetV5::SubSheet const&ss) noexcept {
 	if (ss.subsheets.empty()) {
-		return std::cmp_equal(ss.columns * ss.rows * PixelsPerTile, ss.pixels.size());
+		return static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) == ss.pixels.size();
 	} else {
 		return ss.pixels.empty() && ox::all_of(ss.subsheets.begin(), ss.subsheets.end(),
 				[](TileSheetV5::SubSheet const&s) {