From de3fdeb7b181bc0299378f45ebb72af6cbc04b9e Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:20:34 +1200
Subject: [PATCH 01/31] Fix double-use of va_list in AppendFmt

AppendFmt calls vsnprintf twice, first to check the size of the
formatted string, then to write it for real, but it used the same
va_list for both calls, so the second call got an invalid va_list after
the first call had already consumed all its arguments.

This is UB and at least on Linux makes the second call print garbage. I
presume Windows implements va_list differently such that this somehow
worked correctly, because on Linux, all of the dialog items get parsed
into invalid JSON due to this bug, with lines like this (note the
missing second array element and closing bracket):
    "pos" : [ -55947262,
---
 gpr2gpa/gpr2gpa.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gpr2gpa/gpr2gpa.cpp b/gpr2gpa/gpr2gpa.cpp
index d1f4def..2f9c4e1 100644
--- a/gpr2gpa/gpr2gpa.cpp
+++ b/gpr2gpa/gpr2gpa.cpp
@@ -98,6 +98,11 @@ void AppendFmt(std::vector<uint8_t> &array, const char *fmt, ...)
 	if (resultSize <= 0)
 		return;
 
+	// vsnprintf invalidates the va_list, so we need to
+	// reinit args so the next call doesn't print garbage.
+	va_end(args);
+	va_start(args, fmt);
+
 	size_t appendSize = static_cast<size_t>(resultSize);
 
 	if (SIZE_MAX == appendSize)

From 9aa82066f13c0352acc1885f24490b04da6e3393 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Mon, 10 Jun 2024 17:14:19 +1200
Subject: [PATCH 02/31] Refactor CMakeLists.txt

The BUILD_INTERFACE generator expression isn't actually useful as we
don't use export(). CMAKE_CURRENT_SOURCE_DIR is also unnecessary as
CMake treats relative paths as relative to the current source directory
(or the current binary directory for outputs).
---
 CMakeLists.txt | 54 ++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63b061e..fe0eafe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,18 +127,18 @@ add_library(PortabilityLayer STATIC
 	)
 
 target_include_directories(PortabilityLayer PRIVATE
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/zlib>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/include>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MacRomanConversion>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/stb>
+	Common
+	GpCommon
+	PortabilityLayer
+	zlib
+	rapidjson/include
+	MacRomanConversion
+	stb
 	)
 
 target_compile_options(PortabilityLayer PRIVATE -Wno-multichar)
 
-target_link_libraries(PortabilityLayer zlib MacRomanConversion stb)
+target_link_libraries(PortabilityLayer PRIVATE zlib MacRomanConversion stb)
 
 
 add_library(GpShell STATIC
@@ -153,9 +153,9 @@ add_library(GpShell STATIC
 	)
 
 target_include_directories(GpShell PRIVATE
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer>
+	Common
+	GpCommon
+	PortabilityLayer
 	)
 
 add_library(GpApp STATIC
@@ -233,16 +233,15 @@ add_library(GpApp STATIC
 target_compile_options(GpApp PRIVATE -Wno-multichar)
 
 target_include_directories(GpApp PRIVATE
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon>
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer>
+	Common
+	GpCommon
+	PortabilityLayer
 	)
 
-target_link_libraries(GpApp PortabilityLayer)
+target_link_libraries(GpApp PRIVATE PortabilityLayer)
 
 if(CMAKE_HOST_UNIX)
-	set(EXEC_SOURCES )
-	list(APPEND EXEC_SOURCES
+	set(EXEC_SOURCES
 		AerofoilPortable/GpSystemServices_POSIX.cpp
 		AerofoilPortable/GpThreadEvent_Cpp11.cpp
 		AerofoilPortable/GpAllocator_C.cpp
@@ -260,21 +259,20 @@ if(CMAKE_HOST_UNIX)
 		AerofoilX/GpFileSystem_X.cpp
 		)
 
-	set(EXEC_LIBS )
-	list(APPEND EXEC_LIBS
+	set(EXEC_LIBS
 		${SDL2_LIBRARIES}
 		GpApp
 		GpShell
+		PortabilityLayer
 		)
 
-	set(EXEC_INC_DIRS )
-	list(APPEND EXEC_INC_DIRS
-		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common>
-		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon>
-		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpShell>
-		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/AerofoilSDL>
-		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/AerofoilPortable>
-		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer>
+	set(EXEC_INC_DIRS
+		Common
+		GpCommon
+		GpShell
+		AerofoilSDL
+		AerofoilPortable
+		PortabilityLayer
 		${SDL2_INCLUDE_DIRS}
 		)
 	if(PLATFORM STREQUAL "MAC")
@@ -283,7 +281,7 @@ if(CMAKE_HOST_UNIX)
 			AerofoilMac/AerofoilMac/MacInit.mm
 			)
 		list(APPEND EXEC_INC_DIRS
-			$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/AerofoilMac/AerofoilMac>
+			AerofoilMac/AerofoilMac
 			)
 		list(APPEND EXEC_LIBS
 			"-framework Cocoa"

From e2fcd7851df5ea7488a8b3536cda7a84e49f7b64 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Mon, 5 Aug 2024 15:46:24 +1200
Subject: [PATCH 03/31] Add UnixUnicodeToolShim.cpp

This is the counterpart to WindowsUnicodeToolShim.cpp for *nix systems.
---
 .../UnixUnicodeToolShim.cpp                   | 99 +++++++++++++++++++
 .../WindowsUnicodeToolShim.h                  |  9 ++
 2 files changed, 108 insertions(+)
 create mode 100644 WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp

diff --git a/WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp b/WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
new file mode 100644
index 0000000..65f09c6
--- /dev/null
+++ b/WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
@@ -0,0 +1,99 @@
+#include "WindowsUnicodeToolShim.h"
+
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <dirent.h>
+#include <sys/stat.h>
+
+// Linux and macOS (and probably other non-Windows systems in general) do not
+// have separate file system or command line APIs for different text encodings.
+// On these systems UTF-8 is commonly the system encoding and, if so, argv will
+// typically be UTF-8 encoded, though it is the calling process's responsibility
+// to ensure this, as argv is passed verbatim as a sequence of byte strings.
+//
+// Filesystems on Unix-like systems are typically encoding-unaware, in which
+// case the actual encoding used should match the system encoding, or else
+// manual intervention is required.
+//
+// On macOS, HFS+ and APFS filenames are encoded as UTF-16 and UTF-8
+// respectively, and the C filesystem API accepts UTF-8 strings. There are some
+// gotchas relating to Unicode normalization, where HFS+ enforces a specific
+// form of normalization at the filesystem layer but APFS does not, and using
+// the C API to access the filesystem may avoid automatic normalization that
+// higher-level macOS API functions may perform.
+//
+// In summary, text encoding is still a hairy problem on every computer system,
+// though on the major non-Windows systems, assuming UTF-8 encoding is
+// reasonable. For now, this header simply maps the WindowsUnicodeToolShim
+// functions to their regular C API counterparts.
+int toolMain(int argc, const char **argv);
+int main(int argc, const char **argv) { return toolMain(argc, argv); }
+
+FILE *fopen_utf8(const char *path, const char *options) { return fopen(path, options); }
+int fputs_utf8(const char *str, FILE *f) { return fputs(str, f); }
+int mkdir_utf8(const char *path) { return mkdir(path, 0777); }
+
+void TerminateDirectoryPath(std::string &path)
+{
+	const size_t len = path.length();
+
+	if (len == 0 || path[len - 1] != '/')
+		path.push_back('/');
+}
+
+void ScanDirectoryForExtension
+(
+	std::vector<std::string> &outPaths,
+	const char *path,
+	const char *ending,
+	bool recursive
+) {
+	DIR *dir = opendir(path);
+	if (!dir)
+	{
+		return;
+	}
+
+	size_t endingLen = strlen(ending);
+
+	dirent *ent;
+	while ((ent = readdir(dir)))
+	{
+		if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0)
+			continue;
+		else if (recursive && ent->d_type == DT_DIR)
+		{
+			std::string tmpPath(path);
+			tmpPath.append("/");
+			tmpPath.append(ent->d_name);
+			ScanDirectoryForExtension(
+				outPaths,
+				tmpPath.c_str(),
+				ending,
+				recursive
+			);
+		}
+		else
+		{
+			size_t nameLen = strlen(ent->d_name);
+
+			if (endingLen <= nameLen && memcmp
+				(
+					ent->d_name + nameLen - endingLen,
+					ending,
+					endingLen
+				) == 0
+			) {
+				std::string tmpPath(path);
+				tmpPath.append("/");
+				tmpPath.append(ent->d_name);
+				outPaths.push_back(std::move(tmpPath));
+			}
+		}
+	}
+	closedir(dir);
+}
diff --git a/WindowsUnicodeToolShim/WindowsUnicodeToolShim.h b/WindowsUnicodeToolShim/WindowsUnicodeToolShim.h
index 8d94ab5..2396c69 100644
--- a/WindowsUnicodeToolShim/WindowsUnicodeToolShim.h
+++ b/WindowsUnicodeToolShim/WindowsUnicodeToolShim.h
@@ -8,6 +8,7 @@ int mkdir_utf8(const char *path);
 void TerminateDirectoryPath(std::string &path);
 void ScanDirectoryForExtension(std::vector<std::string>& outPaths, const char *path, const char *ending, bool recursive);
 
+#ifdef _WIN32
 struct DirectoryScanContext;
 struct DirectoryScanEntry
 {
@@ -17,3 +18,11 @@ struct DirectoryScanEntry
 DirectoryScanContext *opendir_utf8(const char *name);
 DirectoryScanEntry *readdir_utf8(DirectoryScanContext *dir);
 void closedir_utf8(DirectoryScanContext *context);
+
+#else
+
+inline int _fseeki64(FILE *stream, long offset, int whence) {
+	return fseek(stream, offset, whence);
+}
+inline long _ftelli64(FILE *stream) { return ftell(stream); };
+#endif

From 1e4ee9335e60ee82c0cb373cd622747f0f7a0ba2 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 11 Jun 2024 01:02:48 +1200
Subject: [PATCH 04/31] Add flattenmov to CMake

---
 CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe0eafe..722fe40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,4 +294,14 @@ if(CMAKE_HOST_UNIX)
 endif()
 
 
+add_executable(flattenmov flattenmov/flattenmov.cpp AerofoilPortable/GpAllocator_C.cpp)
+target_include_directories(flattenmov PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	)
+target_link_libraries(flattenmov PortabilityLayer)
+
+
 install (TARGETS ${EXECNAME})

From c372fcb92d58fc5f4a380bb4854a68cb5f02b19d Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 11 Jun 2024 01:06:27 +1200
Subject: [PATCH 05/31] Add bin2gp to CMake

---
 CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 722fe40..5ec3ded 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -303,5 +303,14 @@ target_include_directories(flattenmov PRIVATE
 	)
 target_link_libraries(flattenmov PortabilityLayer)
 
+add_executable(bin2gp bin2gp/bin2gp.cpp AerofoilPortable/GpAllocator_C.cpp)
+target_include_directories(bin2gp PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	)
+target_link_libraries(bin2gp PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})

From 796b2880cfe99cb7a11f8e42263b705e8dee3619 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 11 Jun 2024 01:08:13 +1200
Subject: [PATCH 06/31] Add hqx2bin to CMake

---
 CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ec3ded..0ec55df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,5 +312,14 @@ target_include_directories(bin2gp PRIVATE
 	)
 target_link_libraries(bin2gp PortabilityLayer)
 
+add_executable(hqx2bin hqx2bin/hqx2bin.cpp AerofoilPortable/GpAllocator_C.cpp)
+target_include_directories(hqx2bin PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	)
+target_link_libraries(hqx2bin PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})

From e2da9bb7c5701b54a70d837fc66b8d38f3196520 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 11 Jun 2024 01:46:18 +1200
Subject: [PATCH 07/31] Add hqx2gp to CMake

---
 CMakeLists.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ec55df..1ba031a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -321,5 +321,19 @@ target_include_directories(hqx2bin PRIVATE
 	)
 target_link_libraries(hqx2bin PortabilityLayer)
 
+add_executable(hqx2gp
+	hqx2gp/hqx2gp.cpp
+	AerofoilPortable/GpAllocator_C.cpp
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
+target_include_directories(hqx2gp PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(hqx2gp PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})

From 7a81b2b396cbc57914bf6b820b7d4cc6f5b74b8a Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 11 Jun 2024 02:08:39 +1200
Subject: [PATCH 08/31] Add gpr2gpa to CMake, port to *nix

---
 CMakeLists.txt      | 18 +++++++++++++
 gpr2gpa/gpr2gpa.cpp | 63 ++++++++++++++++++++++++---------------------
 2 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ba031a..ef25998 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -335,5 +335,23 @@ target_include_directories(hqx2gp PRIVATE
 	)
 target_link_libraries(hqx2gp PortabilityLayer)
 
+add_executable(gpr2gpa
+	gpr2gpa/gpr2gpa.cpp
+	gpr2gpa/macedec.cpp
+	AerofoilPortable/GpAllocator_C.cpp
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
+target_include_directories(gpr2gpa PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	MacRomanConversion
+	WindowsUnicodeToolShim
+	rapidjson/include
+	zlib
+	)
+target_link_libraries(gpr2gpa PortabilityLayer MacRomanConversion zlib)
+
 
 install (TARGETS ${EXECNAME})
diff --git a/gpr2gpa/gpr2gpa.cpp b/gpr2gpa/gpr2gpa.cpp
index 2f9c4e1..27c93b0 100644
--- a/gpr2gpa/gpr2gpa.cpp
+++ b/gpr2gpa/gpr2gpa.cpp
@@ -31,9 +31,9 @@
 #include <stdio.h>
 #include <string>
 #include <sstream>
+#include <utility>
 #include <vector>
 #include <algorithm>
-#include "GpWindows.h"
 
 enum AudioCompressionCodecID
 {
@@ -2432,14 +2432,11 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
 		const size_t numRefs = typeList.m_numRefs;
 
 		{
-			char subName[256];
-			sprintf_s(subName, "%s", resTag.m_id);
-
 			PlannedEntry entry;
-			entry.m_name = subName;
+			entry.m_name = resTag.m_id;
 			entry.m_isDirectory = true;
 
-			contents.push_back(entry);
+			contents.push_back(std::move(entry));
 		}
 
 		for (size_t rlIndex = 0; rlIndex < numRefs; rlIndex++)
@@ -2458,14 +2455,15 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
 
 			if (typeList.m_resType == pictTypeID || typeList.m_resType == dateTypeID)
 			{
-				char resName[256];
-				sprintf_s(resName, "%s/%i.bmp", resTag.m_id, static_cast<int>(res.m_resID));
+				std::string resName = (
+					std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".bmp"
+				).str();
 
-				if (ContainsName(reservedNames, resName))
+				if (ContainsName(reservedNames, resName.c_str()))
 					continue;
 
 				PlannedEntry entry;
-				entry.m_name = resName;
+				entry.m_name = std::move(resName);
 				entry.m_comment = resComment;
 
 				if (ImportPICT(entry.m_uncompressedContents, resData, resSize, dumpqtDir, res.m_resID))
@@ -2475,14 +2473,15 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
 			}
 			else if (typeList.m_resType == sndTypeID)
 			{
-				char resName[256];
-				sprintf_s(resName, "%s/%i.wav", resTag.m_id, static_cast<int>(res.m_resID));
+				std::string resName = (
+					std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".wav"
+				).str();
 
-				if (ContainsName(reservedNames, resName))
+				if (ContainsName(reservedNames, resName.c_str()))
 					continue;
 
 				PlannedEntry entry;
-				entry.m_name = resName;
+				entry.m_name = std::move(resName);
 				entry.m_comment = resComment;
 
 				if (ImportSound(entry.m_uncompressedContents, resData, resSize, res.m_resID))
@@ -2492,14 +2491,15 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
 			}
 			else if (typeList.m_resType == indexStringTypeID)
 			{
-				char resName[256];
-				sprintf_s(resName, "%s/%i.txt", resTag.m_id, static_cast<int>(res.m_resID));
+				std::string resName = (
+					std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".txt"
+				).str();
 
-				if (ContainsName(reservedNames, resName))
+				if (ContainsName(reservedNames, resName.c_str()))
 					continue;
 
 				PlannedEntry entry;
-				entry.m_name = resName;
+				entry.m_name = std::move(resName);
 				entry.m_comment = resComment;
 
 				if (ImportIndexedString(entry.m_uncompressedContents, resData, resSize))
@@ -2507,14 +2507,15 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
 			}
 			else if (typeList.m_resType == ditlTypeID)
 			{
-				char resName[256];
-				sprintf_s(resName, "%s/%i.json", resTag.m_id, static_cast<int>(res.m_resID));
+				std::string resName = (
+					std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".json"
+				).str();
 
-				if (ContainsName(reservedNames, resName))
+				if (ContainsName(reservedNames, resName.c_str()))
 					continue;
 
 				PlannedEntry entry;
-				entry.m_name = resName;
+				entry.m_name = std::move(resName);
 				entry.m_comment = resComment;
 
 				if (ImportDialogItemTemplate(entry.m_uncompressedContents, resData, resSize))
@@ -2529,15 +2530,16 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
 					const IconTypeSpec &iconSpec = iconTypeSpecs[i];
 					if (typeList.m_resType == iconSpec.m_resTypeID)
 					{
-						char resName[256];
-						sprintf_s(resName, "%s/%i.bmp", resTag.m_id, static_cast<int>(res.m_resID));
+						std::string resName = (
+							std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".bmp"
+						).str();
 
-						if (!ContainsName(reservedNames, resName))
+						if (!ContainsName(reservedNames, resName.c_str()))
 						{
 							isIcon = true;
 
 							PlannedEntry entry;
-							entry.m_name = resName;
+							entry.m_name = std::move(resName);
 							entry.m_comment = resComment;
 
 							if (ImportIcon(entry.m_uncompressedContents, resData, resSize, iconSpec.m_width, iconSpec.m_height, iconSpec.m_bpp))
@@ -2550,15 +2552,16 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
 
 				if (!isIcon)
 				{
-					char resName[256];
-					sprintf_s(resName, "%s/%i.bin", resTag.m_id, static_cast<int>(res.m_resID));
+					std::string resName = (
+						std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".bin"
+					).str();
 
-					if (ContainsName(reservedNames, resName))
+					if (ContainsName(reservedNames, resName.c_str()))
 						continue;
 
 					PlannedEntry entry;
 
-					entry.m_name = resName;
+					entry.m_name = std::move(resName);
 					entry.m_comment = resComment;
 					entry.m_uncompressedContents.resize(res.GetSize());
 

From 77009b08ca9a11327287b8de717d96b9273b8fa6 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Sat, 6 Jul 2024 16:04:51 +1200
Subject: [PATCH 09/31] Avoid Clang c++11-narrowing error

Downgrades c++11-narrowing to a warning when compiling with Clang. A
better solution would be to fix the error, but this at least brings
Clang in line with the more permissive GCC, which treats this as a
warning by default.
---
 CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef25998..10b62ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,12 @@ SET(EXECNAME "AerofoilX" CACHE STRING "Defines the exec name")
 
 message(${CMAKE_BINARY_DIR})
 
+# FIXME: Clang treats this as an error by default; fixing the source rather
+# than downgrading the error to a warning would be a better solution.
+add_compile_options(
+	$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=c++11-narrowing>
+	)
+
 find_package(SDL2 REQUIRED)
 
 if(PLATFORM STREQUAL "MAC")

From 8b2db1b142224eef4f85d8515b196ca530ce8298 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 11 Jun 2024 02:13:55 +1200
Subject: [PATCH 10/31] Fix equality test in gpr2gpa.cpp

I don't think this actually gets hit when converting the base Glider PRO
resources, but it's an obvious error that makes the condition always
true.
---
 gpr2gpa/gpr2gpa.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gpr2gpa/gpr2gpa.cpp b/gpr2gpa/gpr2gpa.cpp
index 27c93b0..2c1ff73 100644
--- a/gpr2gpa/gpr2gpa.cpp
+++ b/gpr2gpa/gpr2gpa.cpp
@@ -1471,7 +1471,7 @@ bool DecompressSound(int compressionID, int channelCount, const void *sndData, s
 			}
 		}
 	}
-	else if (compressionID = AudioCompressionCodecID_SixToOne)
+	else if (compressionID == AudioCompressionCodecID_SixToOne)
 	{
 		if (channelCount != 1)
 		{

From e2bb19709de532c86518c79fee0f6b55bb89d341 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 11 Jun 2024 02:59:13 +1200
Subject: [PATCH 11/31] Add MakeTimestamp to CMake, port to *nix

---
 CMakeLists.txt                  |  4 +++
 MakeTimestamp/MakeTimestamp.cpp | 46 ++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10b62ef..4df28c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,5 +359,9 @@ target_include_directories(gpr2gpa PRIVATE
 	)
 target_link_libraries(gpr2gpa PortabilityLayer MacRomanConversion zlib)
 
+add_executable(MakeTimestamp MakeTimestamp/MakeTimestamp.cpp)
+target_include_directories(MakeTimestamp PRIVATE PortabilityLayer)
+target_link_libraries(MakeTimestamp PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})
diff --git a/MakeTimestamp/MakeTimestamp.cpp b/MakeTimestamp/MakeTimestamp.cpp
index bbc9e4e..58694d8 100644
--- a/MakeTimestamp/MakeTimestamp.cpp
+++ b/MakeTimestamp/MakeTimestamp.cpp
@@ -1,6 +1,13 @@
+#ifdef _WIN32
 #include <Windows.h>
-#include <stdio.h>
-#include <stdint.h>
+
+#include <cstdint>
+#else
+#include <cstring>
+#include <ctime>
+#endif
+
+#include <cstdio>
 
 #include "CombinedTimestamp.h"
 
@@ -13,6 +20,7 @@ int main(int argc, const char **argv)
 		return -1;
 	}
 
+#ifdef _WIN32
 	SYSTEMTIME epochStart;
 	epochStart.wYear = 1904;
 	epochStart.wMonth = 1;
@@ -34,13 +42,6 @@ int main(int argc, const char **argv)
 	int64_t currentTime64 = (static_cast<int64_t>(timestampFT.dwLowDateTime) & 0xffffffff) | (static_cast<int64_t>(timestampFT.dwHighDateTime) << 32);
 	int64_t timeDelta = (currentTime64 - epochStart64) / 10000000;
 
-	FILE *f = nullptr;
-	if (fopen_s(&f, argv[1], "wb"))
-	{
-		fprintf(stderr, "Error opening output file");
-		return -1;
-	}
-
 	TIME_ZONE_INFORMATION tz;
 	GetTimeZoneInformation(&tz);
 
@@ -60,9 +61,36 @@ int main(int argc, const char **argv)
 	ts.m_localHour = localST.wHour;
 	ts.m_localMinute = localST.wMinute;
 	ts.m_localSecond = localST.wSecond;
+#else
+	time_t currentTimeUnix = time(nullptr);
+
+	tm *currentTimeStruct = localtime(&currentTimeUnix);
+	if (currentTimeStruct == nullptr) {
+		fprintf(stderr, "Error converting system time to calendar format");
+		return -1;
+	}
+
+	PortabilityLayer::CombinedTimestamp ts;
+	ts.SetMacEpochTime(currentTimeUnix + ts.kMacEpochToUTC);
+
+	ts.SetLocalYear(currentTimeStruct->tm_year + 1900);
+	ts.m_localMonth = currentTimeStruct->tm_mon + 1;
+	ts.m_localDay = currentTimeStruct->tm_mday;
+
+	ts.m_localHour = currentTimeStruct->tm_hour;
+	ts.m_localMinute = currentTimeStruct->tm_min;
+	ts.m_localSecond = currentTimeStruct->tm_sec;
+#endif
 
 	memset(ts.m_padding, 0, sizeof(ts.m_padding));
 
+	FILE *f = fopen(argv[1], "wb");
+	if (!f)
+	{
+		perror("Error opening output file");
+		return -1;
+	}
+
 	fwrite(&ts, sizeof(ts), 1, f);
 
 	fclose(f);

From 77fcc35726685e3fc0aa251d9f5eb2494ca29df7 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Sun, 16 Jun 2024 15:59:16 +1200
Subject: [PATCH 12/31] Add FTagData to CMake, port to *nix

---
 CMakeLists.txt        | 10 ++++++++++
 FTagData/FTagData.cpp |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4df28c0..077d585 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -363,5 +363,15 @@ add_executable(MakeTimestamp MakeTimestamp/MakeTimestamp.cpp)
 target_include_directories(MakeTimestamp PRIVATE PortabilityLayer)
 target_link_libraries(MakeTimestamp PortabilityLayer)
 
+add_executable(FTagData FTagData/FTagData.cpp WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp)
+target_include_directories(FTagData PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(FTagData PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})
diff --git a/FTagData/FTagData.cpp b/FTagData/FTagData.cpp
index c0337df..77a7e0c 100644
--- a/FTagData/FTagData.cpp
+++ b/FTagData/FTagData.cpp
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <string>
-#include <Windows.h>
+
 #include "MacFileInfo.h"
 #include "CFileStream.h"
 #include "CombinedTimestamp.h"

From f27860776b184b6b16f9f2e24bb927cbc8f8d8b0 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Sun, 16 Jun 2024 16:02:09 +1200
Subject: [PATCH 13/31] Add MergeGPF to CMake

---
 CMakeLists.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 077d585..13565d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -373,5 +373,19 @@ target_include_directories(FTagData PRIVATE
 	)
 target_link_libraries(FTagData PortabilityLayer)
 
+add_executable(MergeGPF
+	MergeGPF/MergeGPF.cpp
+	AerofoilPortable/GpAllocator_C.cpp
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
+target_include_directories(MergeGPF PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(MergeGPF PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})

From c2753ec67928e39dd56e417861d5815882cd00cc Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Sun, 16 Jun 2024 16:08:40 +1200
Subject: [PATCH 14/31] Add MiniRez to CMake

Also includes <algorithm> to provide std::find(). Evidently something in
Windows implicitly provides find(), but it was broken on Linux.
---
 CMakeLists.txt      | 9 +++++++++
 MiniRez/MiniRez.cpp | 1 +
 2 files changed, 10 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13565d0..cc95a8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -387,5 +387,14 @@ target_include_directories(MergeGPF PRIVATE
 	)
 target_link_libraries(MergeGPF PortabilityLayer)
 
+add_executable(MiniRez MiniRez/MiniRez.cpp WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp)
+target_include_directories(MiniRez PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(MiniRez PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})
diff --git a/MiniRez/MiniRez.cpp b/MiniRez/MiniRez.cpp
index 6b03b48..644a5f0 100644
--- a/MiniRez/MiniRez.cpp
+++ b/MiniRez/MiniRez.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <stdio.h>
 #include <string>
 #include <vector>

From e78d93437a75bc92b28455f3cf6e76f834150fd6 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Sun, 16 Jun 2024 16:19:20 +1200
Subject: [PATCH 15/31] Add HouseTool to CMake

---
 CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc95a8b..9c529e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -396,5 +396,15 @@ target_include_directories(MiniRez PRIVATE
 	)
 target_link_libraries(MiniRez PortabilityLayer)
 
+add_executable(HouseTool HouseTool/HouseTool.cpp WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp)
+target_include_directories(HouseTool PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	MacRomanConversion
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(HouseTool PortabilityLayer MacRomanConversion)
+
 
 install (TARGETS ${EXECNAME})

From 5c74c967715d33035ff43dc2a8ae11e1e8ec179c Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Sun, 16 Jun 2024 16:57:53 +1200
Subject: [PATCH 16/31] Add unpacktool to CMake, port to *nix

- Adds missing includes, removes some unused ones.
- Removes unused Windows.h and shellapi.h includes.
- Uses / as path separator. This is portable and should still work fine
  on Windows.
---
 CMakeLists.txt                         | 35 ++++++++++++++++++++++++++
 unpacktool/CompactProRLEDecompressor.h |  2 ++
 unpacktool/IDecompressor.h             |  2 +-
 unpacktool/IFileReader.h               |  3 ++-
 unpacktool/PrefixCode.cpp              |  2 ++
 unpacktool/RLE90Decompressor.h         |  2 ++
 unpacktool/unpacktool.cpp              |  5 +---
 7 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c529e2..21e0f03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,5 +406,40 @@ target_include_directories(HouseTool PRIVATE
 	)
 target_link_libraries(HouseTool PortabilityLayer MacRomanConversion)
 
+add_executable(unpacktool
+	unpacktool/ArchiveDescription.cpp
+	unpacktool/BWT.cpp
+	unpacktool/CompactProLZHDecompressor.cpp
+	unpacktool/CompactProLZHRLEDecompressor.cpp
+	unpacktool/CompactProParser.cpp
+	unpacktool/CompactProRLEDecompressor.cpp
+	unpacktool/CRC.cpp
+	unpacktool/CSInputBuffer.cpp
+	unpacktool/DecompressorProxyReader.cpp
+	unpacktool/LZSSDecompressor.cpp
+	unpacktool/LZW.cpp
+	unpacktool/LZWDecompressor.cpp
+	unpacktool/NullDecompressor.cpp
+	unpacktool/PrefixCode.cpp
+	unpacktool/RLE90Decompressor.cpp
+	unpacktool/StringCommon.cpp
+	unpacktool/StuffIt13Decompressor.cpp
+	unpacktool/StuffIt5Parser.cpp
+	unpacktool/StuffItArsenicDecompressor.cpp
+	unpacktool/StuffItCommon.cpp
+	unpacktool/StuffItHuffmanDecompressor.cpp
+	unpacktool/StuffItParser.cpp
+	unpacktool/unpacktool.cpp
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
+target_include_directories(unpacktool PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	MacRomanConversion
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(unpacktool PortabilityLayer MacRomanConversion)
+
 
 install (TARGETS ${EXECNAME})
diff --git a/unpacktool/CompactProRLEDecompressor.h b/unpacktool/CompactProRLEDecompressor.h
index 51586ea..af33fb7 100644
--- a/unpacktool/CompactProRLEDecompressor.h
+++ b/unpacktool/CompactProRLEDecompressor.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+
 #include "IDecompressor.h"
 
 class CompactProRLEDecompressor : public IDecompressor
diff --git a/unpacktool/IDecompressor.h b/unpacktool/IDecompressor.h
index b1a5f4c..8788ea4 100644
--- a/unpacktool/IDecompressor.h
+++ b/unpacktool/IDecompressor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstddef>
 
 struct CSInputBuffer;
 
diff --git a/unpacktool/IFileReader.h b/unpacktool/IFileReader.h
index bd40ed7..a6ad14a 100644
--- a/unpacktool/IFileReader.h
+++ b/unpacktool/IFileReader.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 struct IFileReader
 {
diff --git a/unpacktool/PrefixCode.cpp b/unpacktool/PrefixCode.cpp
index 0546bad..01912c1 100644
--- a/unpacktool/PrefixCode.cpp
+++ b/unpacktool/PrefixCode.cpp
@@ -1,3 +1,5 @@
+#include <climits>
+
 #include "PrefixCode.h"
 
 struct XADCodeTreeNode
diff --git a/unpacktool/RLE90Decompressor.h b/unpacktool/RLE90Decompressor.h
index cf81fea..77cd22a 100644
--- a/unpacktool/RLE90Decompressor.h
+++ b/unpacktool/RLE90Decompressor.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+
 #include "IDecompressor.h"
 
 class RLE90Decompressor : public IDecompressor
diff --git a/unpacktool/unpacktool.cpp b/unpacktool/unpacktool.cpp
index e82a84b..7defb39 100644
--- a/unpacktool/unpacktool.cpp
+++ b/unpacktool/unpacktool.cpp
@@ -28,9 +28,6 @@
 
 #include <string.h>
 
-#include <Windows.h>
-#include <shellapi.h>
-
 #include <string>
 #include <vector>
 
@@ -387,7 +384,7 @@ int ExtractItem(int depth, const ArchiveItem &item, const std::string &dirPath,
 	{
 		mkdir_utf8(path.c_str());
 
-		path.append("\\");
+		path.append("/");
 
 		int returnCode = RecursiveExtractFiles(depth + 1, item.m_children, path, pathParanoid, reader, ts);
 		if (returnCode)

From a7f5b653facae6d68bcf3f1b34dd9a0dbb6ee444 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Sun, 16 Jun 2024 23:18:53 +1200
Subject: [PATCH 17/31] Add GpFontHandler_FreeType2 to CMake

Also add stddef.h include to GpRenderedGlyphMetrics.h to make size_t
visible. Does MSVC provide size_t by default, or via stdint.h? This
prevents compilation and I can't see how this would have compiled on
Windows otherwise.
---
 CMakeLists.txt                    | 16 ++++++++++++++++
 GpCommon/GpRenderedGlyphMetrics.h |  1 +
 2 files changed, 17 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21e0f03..19e2ea9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -442,4 +442,20 @@ target_include_directories(unpacktool PRIVATE
 target_link_libraries(unpacktool PortabilityLayer MacRomanConversion)
 
 
+find_package(Freetype)
+if(FREETYPE_FOUND)
+	add_library(GpFontHandler_FreeType2 STATIC
+		GpFontHandler_FreeType2/GpFontHandler_FreeType2.cpp
+		)
+
+	target_include_directories(GpFontHandler_FreeType2 PRIVATE
+		Common
+		GpCommon
+		"${FREETYPE_INCLUDE_DIR_ft2build}"
+		)
+
+	target_link_libraries(GpFontHandler_FreeType2 PRIVATE Freetype::Freetype)
+endif()
+
+
 install (TARGETS ${EXECNAME})
diff --git a/GpCommon/GpRenderedGlyphMetrics.h b/GpCommon/GpRenderedGlyphMetrics.h
index 91415a8..584d5cb 100644
--- a/GpCommon/GpRenderedGlyphMetrics.h
+++ b/GpCommon/GpRenderedGlyphMetrics.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <stddef.h>
 #include <stdint.h>
 
 struct GpRenderedGlyphMetrics

From 8b916867d55549b4c3e33819176a69efe6594723 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Mon, 17 Jun 2024 15:14:30 +1200
Subject: [PATCH 18/31] Add GenerateFonts to CMake, port to *nix

Removes unused Windows-specific headers and adds arguments to specify
source and output directories, which is necessary for out-of-tree
builds, which are necessary to avoid name collisions on platforms where
executables have no file extension (so, basically everything except
Windows).
---
 CMakeLists.txt                  | 15 +++++++++++++
 ConvertResources.bat            |  2 +-
 GenerateFonts/GenerateFonts.cpp | 38 +++++++++++++++++++++++++--------
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19e2ea9..c18bf9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -455,6 +455,21 @@ if(FREETYPE_FOUND)
 		)
 
 	target_link_libraries(GpFontHandler_FreeType2 PRIVATE Freetype::Freetype)
+
+
+	add_executable(GenerateFonts
+		GenerateFonts/GenerateFonts.cpp
+		AerofoilPortable/GpAllocator_C.cpp
+		WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+		)
+	target_include_directories(GenerateFonts PRIVATE
+		Common
+		GpCommon
+		PortabilityLayer
+		AerofoilPortable
+		WindowsUnicodeToolShim
+		)
+	target_link_libraries(GenerateFonts PortabilityLayer GpFontHandler_FreeType2)
 endif()
 
 
diff --git a/ConvertResources.bat b/ConvertResources.bat
index 0907a67..89c9392 100644
--- a/ConvertResources.bat
+++ b/ConvertResources.bat
@@ -8,7 +8,7 @@ x64\Release\gpr2gpa.exe "Packaged\ApplicationResources.gpr" "DefaultTimestamp.ti
 x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\ApplicationResources.gpf" data ozm5 0 0 locked
 x64\Release\MergeGPF.exe "Packaged\ApplicationResources.gpf"
 
-x64\Release\GenerateFonts.exe
+x64\Release\GenerateFonts.exe Resources Packaged
 
 x64\Release\MiniRez.exe "Empty.r" Packaged\Fonts.gpr
 x64\Release\gpr2gpa.exe "Packaged\Fonts.gpr" "DefaultTimestamp.timestamp" "Packaged\Fonts.gpa" -patch "Packaged\FontCacheManifest.json"
diff --git a/GenerateFonts/GenerateFonts.cpp b/GenerateFonts/GenerateFonts.cpp
index 53d1506..fdaa96f 100644
--- a/GenerateFonts/GenerateFonts.cpp
+++ b/GenerateFonts/GenerateFonts.cpp
@@ -1,3 +1,7 @@
+#include <algorithm>
+#include <string>
+#include <vector>
+
 #include "FontFamily.h"
 #include "FontManager.h"
 #include "FontRenderer.h"
@@ -7,8 +11,6 @@
 #include "GpAppInterface.h"
 #include "GpDriverIndex.h"
 #include "GpFontHandlerProperties.h"
-#include "GpFileSystem_Win32.h"
-#include "GpSystemServices_Win32.h"
 #include "CFileStream.h"
 
 #include "PLDrivers.h"
@@ -17,7 +19,11 @@
 
 #include "WindowsUnicodeToolShim.h"
 
-extern "C" __declspec(dllimport) IGpFontHandler *GpDriver_CreateFontHandler_FreeType2(const GpFontHandlerProperties &properties);
+extern "C"
+#ifdef _MSC_VER
+__declspec(dllimport)
+#endif
+IGpFontHandler *GpDriver_CreateFontHandler_FreeType2(const GpFontHandlerProperties &properties);
 
 class MemBufferStream final : public GpIOStream
 {
@@ -168,6 +174,16 @@ bool KnownFontSpec::operator!=(const KnownFontSpec &other) const
 
 int toolMain(int argc, const char **argv)
 {
+	if (argc < 3)
+	{
+		fputs("Usage: GenerateFonts <resources dir> <output dir>\n", stderr);
+		return -1;
+	}
+	std::string resourcesDir(argv[1]);
+	resourcesDir += '/';
+	std::string outputDir(argv[2]);
+	outputDir += '/';
+
 	IGpAllocator *alloc = GpAllocator_C::GetInstance();
 
 	GpFontHandlerProperties fhProperties;
@@ -187,12 +203,13 @@ int toolMain(int argc, const char **argv)
 	std::vector<PortabilityLayer::RenderedFontCatalogRFontEntry> catalog;
 	std::vector<KnownFontSpec> fontSpecs;
 
-	FILE *manifestF = fopen_utf8("Packaged/FontCacheManifest.json", "wb");
+	std::string tmpPath(outputDir + "FontCacheManifest.json");
+	FILE *manifestF = fopen_utf8(tmpPath.c_str(), "wb");
 
 	fprintf(manifestF, "{\n");
 	fprintf(manifestF, "\t\"add\" :\n");
 	fprintf(manifestF, "\t{\n");
-	fprintf(manifestF, "\t\t\"RFCT/1000.bin\" : \"Packaged/FontCacheCatalog.bin\"");
+	fprintf(manifestF, "\t\t\"RFCT/1000.bin\" : \"%sFontCacheCatalog.bin\"", outputDir.c_str());
 
 	int numFontsEmitted = 0;
 	for (int presetIndex = 0; presetIndex < PortabilityLayer::FontPresets::kCount; presetIndex++)
@@ -220,8 +237,9 @@ int toolMain(int argc, const char **argv)
 
 		fontSpecs.push_back(spec);
 
-		std::string resPath = std::string("Resources/") + path;
-		FILE *fontFile = fopen_utf8(resPath.c_str(), "rb");
+		tmpPath = resourcesDir;
+		tmpPath += path;
+		FILE *fontFile = fopen_utf8(tmpPath.c_str(), "rb");
 
 		if (fontFile)
 		{
@@ -236,7 +254,7 @@ int toolMain(int argc, const char **argv)
 
 			{
 				char fontPath[1024];
-				sprintf(fontPath, "Packaged/CachedFont%i.bin", numFontsEmitted);
+				sprintf(fontPath, "%sCachedFont%i.bin", outputDir.c_str(), numFontsEmitted);
 
 				FILE *cachedFontF = fopen_utf8(fontPath, "wb");
 				PortabilityLayer::CFileStream cacheStream(cachedFontF);
@@ -290,7 +308,9 @@ int toolMain(int argc, const char **argv)
 
 	PortabilityLayer::RenderedFontCatalogHeader catHeader;
 
-	FILE *catF = fopen_utf8("Packaged/FontCacheCatalog.bin", "wb");
+	tmpPath = outputDir;
+	tmpPath += "FontCacheCatalog.bin";
+	FILE *catF = fopen_utf8(tmpPath.c_str(), "wb");
 
 	catHeader.m_version = PortabilityLayer::RenderedFontCatalogHeader::kVersion;
 	catHeader.m_pathsOffset = static_cast<uint32_t>(sizeof(PortabilityLayer::RenderedFontCatalogHeader) + paths.size() * sizeof(PortabilityLayer::RenderedFontCatalogPathEntry) + numFontsEmitted * sizeof(PortabilityLayer::RenderedFontCatalogRFontEntry));

From 0ebdabc12f78462c1935d1779447399e7d04b93c Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 18 Jun 2024 12:47:19 +1200
Subject: [PATCH 19/31] Add ConvertColorCursors to CMake, port to *nix

- Includes WindowsUnicodeToolShim.h.
- Replaces sprintf_s() with std::ostringstream.
- Replaces fopen_s() with fopen_utf8().
- Switches to the toolMain() wrapper, which is a no-op on except on
  Windows, where it should improve Unicode support, though I can't test
  that on my end.
- Replaces \ with / in paths, which should still be Windows-compatible.
---
 CMakeLists.txt                              | 16 ++++++++++++
 ConvertColorCursors/ConvertColorCursors.cpp | 29 +++++++++++++--------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c18bf9d..02ed2cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -472,5 +472,21 @@ if(FREETYPE_FOUND)
 	target_link_libraries(GenerateFonts PortabilityLayer GpFontHandler_FreeType2)
 endif()
 
+add_executable(ConvertColorCursors
+	ConvertColorCursors/ConvertColorCursors.cpp
+	AerofoilPortable/GpAllocator_C.cpp
+	stb/stb_image_write.c
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
+target_include_directories(ConvertColorCursors PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	stb
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(ConvertColorCursors PortabilityLayer)
+
 
 install (TARGETS ${EXECNAME})
diff --git a/ConvertColorCursors/ConvertColorCursors.cpp b/ConvertColorCursors/ConvertColorCursors.cpp
index 4d8ee7e..3dd5664 100644
--- a/ConvertColorCursors/ConvertColorCursors.cpp
+++ b/ConvertColorCursors/ConvertColorCursors.cpp
@@ -8,8 +8,11 @@
 #include "QDStandardPalette.h"
 #include "PLBigEndian.h"
 #include "PLDrivers.h"
-#include <assert.h>
+#include "WindowsUnicodeToolShim.h"
 
+#include <cassert>
+#include <cstdio>
+#include <sstream>
 #include <string>
 #include <vector>
 
@@ -92,12 +95,12 @@ void ConvertIconFamily(PortabilityLayer::ResourceFile *resFile, int32_t iconBitm
 				item.a = 0;
 		}
 
-		char outPath[256];
-		sprintf_s(outPath, "Aerofoil\\ConvertedResources\\%s%i.ico", prefix, resID);
+		std::string outPath = (
+			std::ostringstream() << "Aerofoil/ConvertedResources/" << prefix << resID << ".ico"
+		).str();
 
-		FILE *outF = nullptr;
-		errno_t outErr = fopen_s(&outF, outPath, "wb");
-		if (!outErr)
+		FILE *outF = fopen_utf8(outPath.c_str(), "wb");
+		if (outF)
 		{
 			IconDir iconDir;
 			iconDir.m_reserved = 0;
@@ -127,6 +130,8 @@ void ConvertIconFamily(PortabilityLayer::ResourceFile *resFile, int32_t iconBitm
 			fwrite(&iconDirEntry, 1, sizeof(IconDirEntry), outF);
 			fclose(outF);
 		}
+		else
+			perror(outPath.c_str());
 
 		delete[] pixelData;
 		bwBlock.Dispose();
@@ -134,12 +139,14 @@ void ConvertIconFamily(PortabilityLayer::ResourceFile *resFile, int32_t iconBitm
 	}
 }
 
-int main(int argc, const char **argv)
+int toolMain(int argc, const char **argv)
 {
-	FILE *f = nullptr;
-	errno_t err = fopen_s(&f, "Packaged\\ApplicationResources.gpr", "rb");
-	if (err)
-		return err;
+	FILE *f = fopen_utf8("Packaged/ApplicationResources.gpr", "rb");
+	if (!f)
+	{
+		perror("Cannot open Packaged/ApplicationResources.gpr");
+		return -1;
+	}
 
 	PortabilityLayer::CFileStream stream(f);
 

From 91e2f3b25fb004492c376ef56056edf7b45afb2c Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 18 Jun 2024 16:31:58 +1200
Subject: [PATCH 20/31] Add ApplicationResources.gpf to CMake

---
 CMakeLists.txt | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02ed2cc..99e0986 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,4 +489,43 @@ target_include_directories(ConvertColorCursors PRIVATE
 target_link_libraries(ConvertColorCursors PortabilityLayer)
 
 
-install (TARGETS ${EXECNAME})
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Packaged/Houses")
+
+set(DATA_FILES)
+
+list(APPEND DATA_FILES Packaged/ApplicationResources.gpf)
+add_custom_command(
+	OUTPUT
+		Packaged/ApplicationResources.gpf
+	BYPRODUCTS
+		Packaged/ApplicationResources.gpr
+		Packaged/ApplicationResources.gpa
+	DEPENDS MiniRez gpr2gpa FTagData MergeGPF
+	COMMAND MiniRez
+		"GliderProData/Glider PRO.r"
+		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpr"
+	COMMAND gpr2gpa
+		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpr"
+		DefaultTimestamp.timestamp
+		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpa"
+		-patch ApplicationResourcePatches/manifest.json
+	COMMAND FTagData
+		DefaultTimestamp.timestamp
+		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpf"
+		data ozm5 0 0 locked
+	COMMAND MergeGPF
+		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpf"
+	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+	VERBATIM
+	)
+
+add_custom_target(Resources ALL
+	DEPENDS
+		${DATA_FILES}
+	)
+
+
+list(TRANSFORM DATA_FILES PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
+
+install(TARGETS "${EXECNAME}" COMPONENT Executable)
+install(FILES ${DATA_FILES} DESTINATION lib/aerofoil/Packaged COMPONENT Resources)

From 8a5b50d98d837f5b9109748022e96096261bc292 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 18 Jun 2024 16:40:16 +1200
Subject: [PATCH 21/31] Add Fonts.gpf to CMake

---
 CMakeLists.txt | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99e0986..177cfdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,6 +519,46 @@ add_custom_command(
 	VERBATIM
 	)
 
+list(APPEND DATA_FILES Packaged/Fonts.gpf)
+add_custom_command(
+	OUTPUT
+		Packaged/Fonts.gpf
+	BYPRODUCTS
+		Packaged/Fonts.gpr
+		Packaged/Fonts.gpa
+		Packaged/FontCacheCatalog.bin
+		Packaged/FontCacheManifest.json
+		Packaged/CachedFont0.bin
+		Packaged/CachedFont1.bin
+		Packaged/CachedFont2.bin
+		Packaged/CachedFont3.bin
+		Packaged/CachedFont4.bin
+		Packaged/CachedFont5.bin
+		Packaged/CachedFont6.bin
+		Packaged/CachedFont7.bin
+		Packaged/CachedFont8.bin
+		Packaged/CachedFont9.bin
+		Packaged/CachedFont10.bin
+		Packaged/CachedFont11.bin
+		Packaged/CachedFont12.bin
+		Packaged/CachedFont13.bin
+		Packaged/CachedFont14.bin
+	DEPENDS GenerateFonts MiniRez gpr2gpa FTagData MergeGPF
+	COMMAND GenerateFonts "${CMAKE_SOURCE_DIR}/Resources" Packaged
+	COMMAND MiniRez "${CMAKE_SOURCE_DIR}/Empty.r" Packaged/Fonts.gpr
+	COMMAND gpr2gpa
+		Packaged/Fonts.gpr
+		"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
+		Packaged/Fonts.gpa
+		-patch Packaged/FontCacheManifest.json
+	COMMAND FTagData
+		DefaultTimestamp.timestamp
+		Packaged/Fonts.gpf
+		data ozm5 0 0 locked
+	COMMAND MergeGPF Packaged/Fonts.gpf
+	VERBATIM
+	)
+
 add_custom_target(Resources ALL
 	DEPENDS
 		${DATA_FILES}

From d9049f3c8ae72bd827355d1d905c66fbdfc32631 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 18 Jun 2024 16:45:23 +1200
Subject: [PATCH 22/31] Add icons to CMake (commented-out)

These are only used on Windows and the converted files have been
committed to the repo, but this might be useful to someone.
---
 CMakeLists.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 177cfdd..97ba4d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -559,6 +559,29 @@ add_custom_command(
 	VERBATIM
 	)
 
+# These files are committed to the repo and aren't currently useful on non-Windows systems anyway.
+#file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Aerofoil/ConvertedResources)
+#
+#set(CONVERTED_ICONS
+#	Aerofoil/ConvertedResources/Large128.ico
+#	Aerofoil/ConvertedResources/Large129.ico
+#	Aerofoil/ConvertedResources/Large130.ico
+#	Aerofoil/ConvertedResources/Large131.ico
+#	Aerofoil/ConvertedResources/Large132.ico
+#	Aerofoil/ConvertedResources/Large133.ico
+#	Aerofoil/ConvertedResources/Small128.ico
+#	Aerofoil/ConvertedResources/Small129.ico
+#	Aerofoil/ConvertedResources/Small130.ico
+#	Aerofoil/ConvertedResources/Small133.ico
+#	)
+#
+#add_custom_command(
+#	OUTPUT ${CONVERTED_ICONS}
+#	DEPENDS ConvertColorCursors Packaged/ApplicationResources.gpr
+#	COMMAND ConvertColorCursors
+#	)
+#add_custom_target(Icons DEPENDS ${CONVERTED_ICONS})
+
 add_custom_target(Resources ALL
 	DEPENDS
 		${DATA_FILES}

From f65d550300c296db836204f19036836e24cf602c Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Mon, 8 Jul 2024 19:53:01 +1200
Subject: [PATCH 23/31] Add houses to CMake

---
 CMakeLists.txt | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97ba4d4..0b1cab6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -582,13 +582,113 @@ add_custom_command(
 #	)
 #add_custom_target(Icons DEPENDS ${CONVERTED_ICONS})
 
+set(HOUSE_FILES)
+
+function(add_house NAME)
+	cmake_parse_arguments(PARSE_ARGV 0 ARG
+		""
+		PATCH
+		""
+		)
+
+	if(ARG_PATCH)
+		set(PATCH_ARGS -patch "${CMAKE_SOURCE_DIR}/HousePatches/${ARG_PATCH}")
+	endif()
+
+	set(BASE_PATH "Packaged/Houses/${NAME}")
+	list(APPEND HOUSE_FILES "${BASE_PATH}.gpf")
+
+	set(BYPRODUCTS "${BASE_PATH}.gpr" "${BASE_PATH}.gpa" "${BASE_PATH}.gpd")
+
+	add_custom_command(
+		OUTPUT
+			"${BASE_PATH}.gpf"
+		BYPRODUCTS
+			${BYPRODUCTS}
+		DEPENDS hqx2gp gpr2gpa MergeGPF
+		COMMAND hqx2gp
+			"${CMAKE_SOURCE_DIR}/GliderProData/Houses/${NAME}.binhex"
+			"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
+			"${BASE_PATH}"
+		COMMAND gpr2gpa
+			"${BASE_PATH}.gpr"
+			"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
+			"${BASE_PATH}.gpa"
+			${PATCH_ARGS}
+		${HOUSE_EXTRA_COMMANDS}
+		COMMAND MergeGPF
+			"${BASE_PATH}.gpf"
+		COMMAND "${CMAKE_COMMAND}" -E rm
+			${BYPRODUCTS}
+		VERBATIM
+		)
+
+	set(MOV_GPA_SRC "${CMAKE_SOURCE_DIR}/GliderProData/ConvertedMovies/${NAME}.mov.gpa")
+	if(EXISTS "${MOV_GPA_SRC}")
+		list(APPEND HOUSE_FILES "${BASE_PATH}.mov.gpf")
+
+		add_custom_command(
+			OUTPUT
+				"${BASE_PATH}.mov.gpf"
+			BYPRODUCTS
+				"${BASE_PATH}.mov.gpa"
+			DEPENDS FTagData MergeGPF "${MOV_GPA_SRC}"
+			COMMAND FTagData
+				"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
+				"${BASE_PATH}.mov.gpf"
+				MooV ozm5 0 0 locked
+			COMMAND "${CMAKE_COMMAND}" -E copy
+				-t "Packaged/Houses"
+				"${MOV_GPA_SRC}"
+			COMMAND MergeGPF
+				"${BASE_PATH}.mov.gpf"
+			COMMAND "${CMAKE_COMMAND}" -E rm
+				"${BASE_PATH}.mov.gpa"
+			VERBATIM
+			)
+	endif()
+	set(HOUSE_FILES "${HOUSE_FILES}" PARENT_SCOPE)
+endfunction()
+
+add_house("Art Museum")
+add_house("California or Bust!")
+
+set(HOUSE_EXTRA_COMMANDS
+	DEPENDS HouseTool
+	COMMAND HouseTool
+		patch "Packaged/Houses/Castle o' the Air.gpd" .firstRoom 77
+	)
+add_house("Castle o' the Air")
+unset(HOUSE_EXTRA_COMMANDS)
+
+add_house("CD Demo House")
+add_house("Davis Station")
+add_house("Demo House")
+add_house("Fun House")
+add_house("Grand Prix" PATCH "GrandPrix.json")
+add_house("ImagineHouse PRO II" PATCH "ImagineHousePROII.json")
+add_house("In The Mirror" PATCH "InTheMirror.json")
+add_house("Land of Illusion")
+add_house("Leviathan" PATCH "Leviathan.json")
+add_house("Metropolis")
+add_house("Nemo's Market")
+add_house("Rainbow's End" PATCH "RainbowsEnd.json")
+add_house("Slumberland")
+add_house("SpacePods")
+add_house("Teddy World")
+add_house("The Asylum Pro")
+add_house("Titanic")
+
 add_custom_target(Resources ALL
 	DEPENDS
 		${DATA_FILES}
+		${HOUSE_FILES}
 	)
 
 
 list(TRANSFORM DATA_FILES PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
+list(TRANSFORM HOUSE_FILES PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
 
 install(TARGETS "${EXECNAME}" COMPONENT Executable)
 install(FILES ${DATA_FILES} DESTINATION lib/aerofoil/Packaged COMPONENT Resources)
+install(FILES ${HOUSE_FILES} DESTINATION lib/aerofoil/Packaged/Houses COMPONENT Resources)

From 660d79980aa119f20a12517c40b452f536ee6782 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:50:04 +1200
Subject: [PATCH 24/31] Add add_data_file() to CMakeLists.txt

This automatically cleans up artifacts specified as BYPRODUCTS after
running the commands.
---
 CMakeLists.txt | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b1cab6..991c3de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -493,13 +493,36 @@ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Packaged/Houses")
 
 set(DATA_FILES)
 
-list(APPEND DATA_FILES Packaged/ApplicationResources.gpf)
-add_custom_command(
-	OUTPUT
-		Packaged/ApplicationResources.gpf
+function(add_data_file NAME)
+	list(APPEND DATA_FILES "Packaged/${NAME}")
+	set(DATA_FILES "${DATA_FILES}" PARENT_SCOPE)
+
+	cmake_parse_arguments(PARSE_ARGV 1 ARG
+		""
+		""
+		"BYPRODUCTS;COMMANDS"
+		)
+
+	if(ARG_BYPRODUCTS)
+		set(RM_BYPRODUCTS_COMMAND COMMAND "${CMAKE_COMMAND}" -E rm)
+		set(RM_BYPRODUCTS_PATHS "${ARG_BYPRODUCTS}")
+		list(TRANSFORM RM_BYPRODUCTS_PATHS PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
+	endif()
+
+	add_custom_command(
+		OUTPUT "Packaged/${NAME}"
+		BYPRODUCTS ${ARG_BYPRODUCTS}
+		${ARG_COMMANDS}
+		${RM_BYPRODUCTS_COMMAND} ${RM_BYPRODUCTS_PATHS}
+		VERBATIM
+		)
+endfunction()
+
+add_data_file(ApplicationResources.gpf
 	BYPRODUCTS
 		Packaged/ApplicationResources.gpr
 		Packaged/ApplicationResources.gpa
+	COMMANDS
 	DEPENDS MiniRez gpr2gpa FTagData MergeGPF
 	COMMAND MiniRez
 		"GliderProData/Glider PRO.r"
@@ -516,13 +539,9 @@ add_custom_command(
 	COMMAND MergeGPF
 		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpf"
 	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-	VERBATIM
 	)
 
-list(APPEND DATA_FILES Packaged/Fonts.gpf)
-add_custom_command(
-	OUTPUT
-		Packaged/Fonts.gpf
+add_data_file(Fonts.gpf
 	BYPRODUCTS
 		Packaged/Fonts.gpr
 		Packaged/Fonts.gpa
@@ -543,6 +562,7 @@ add_custom_command(
 		Packaged/CachedFont12.bin
 		Packaged/CachedFont13.bin
 		Packaged/CachedFont14.bin
+	COMMANDS
 	DEPENDS GenerateFonts MiniRez gpr2gpa FTagData MergeGPF
 	COMMAND GenerateFonts "${CMAKE_SOURCE_DIR}/Resources" Packaged
 	COMMAND MiniRez "${CMAKE_SOURCE_DIR}/Empty.r" Packaged/Fonts.gpr
@@ -556,7 +576,6 @@ add_custom_command(
 		Packaged/Fonts.gpf
 		data ozm5 0 0 locked
 	COMMAND MergeGPF Packaged/Fonts.gpf
-	VERBATIM
 	)
 
 # These files are committed to the repo and aren't currently useful on non-Windows systems anyway.

From 13f0874757bb9a7e1b6e79174ebd3fc2559485a2 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Sat, 6 Jul 2024 14:31:27 +1200
Subject: [PATCH 25/31] Enable CMake Release build type and LTO by default

---
 CMakeLists.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 991c3de..4ff390b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,22 @@ SET(EXECNAME "AerofoilX" CACHE STRING "Defines the exec name")
 
 message(${CMAKE_BINARY_DIR})
 
+# Use Release build type by default
+if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	set(CMAKE_BUILD_TYPE Release)
+	message("Build type unspecified, using Release")
+endif()
+
+# Enable LTO by default if supported
+if("${CMAKE_INTERPROCEDURAL_OPTIMIZATION}" STREQUAL "")
+	include(CheckIPOSupported)
+	check_ipo_supported(RESULT IPO_SUPPORTED)
+	if(IPO_SUPPORTED)
+		set(CMAKE_INTERPROCEDURAL_OPTIMIZATION On)
+		message("Compiler supports LTO, enabling automatically")
+	endif()
+endif()
+
 # FIXME: Clang treats this as an error by default; fixing the source rather
 # than downgrading the error to a warning would be a better solution.
 add_compile_options(

From 68db3cd83e41dcc63940566638b598d0558c9e16 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Mon, 8 Jul 2024 16:29:29 +1200
Subject: [PATCH 26/31] Add Executable build target

This is meant as an alias to the name of the main executable, for
consistency with the Executable install component.
---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ff390b..77dec09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -714,6 +714,8 @@ add_house("Teddy World")
 add_house("The Asylum Pro")
 add_house("Titanic")
 
+add_custom_target(Executable DEPENDS "${EXECNAME}")
+
 add_custom_target(Resources ALL
 	DEPENDS
 		${DATA_FILES}

From 6a13e44dae4d5c1ba50132297f4de016e1274464 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Mon, 8 Jul 2024 16:45:17 +1200
Subject: [PATCH 27/31] Add Tools CMake build target

All the individual executables are marked EXCLUDE_FROM_ALL, but the
added Tools custom target is marked ALL. The only visible effect of this
is that ConvertColorCursors does not get built by default, since all the
other tools are dependencies for the Resources or Tools targets, which
are both built by default. Otherwise, the benefit is simply to keep the
dependency tree clean. Only three targets are built by default:
Aerofoil, its resources and the conversion tools. Everything else is
built to satisfy dependencies.
---
 CMakeLists.txt | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77dec09..2335648 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,7 +316,7 @@ if(CMAKE_HOST_UNIX)
 endif()
 
 
-add_executable(flattenmov flattenmov/flattenmov.cpp AerofoilPortable/GpAllocator_C.cpp)
+add_executable(flattenmov EXCLUDE_FROM_ALL flattenmov/flattenmov.cpp AerofoilPortable/GpAllocator_C.cpp)
 target_include_directories(flattenmov PRIVATE
 	Common
 	GpCommon
@@ -325,7 +325,7 @@ target_include_directories(flattenmov PRIVATE
 	)
 target_link_libraries(flattenmov PortabilityLayer)
 
-add_executable(bin2gp bin2gp/bin2gp.cpp AerofoilPortable/GpAllocator_C.cpp)
+add_executable(bin2gp EXCLUDE_FROM_ALL bin2gp/bin2gp.cpp AerofoilPortable/GpAllocator_C.cpp)
 target_include_directories(bin2gp PRIVATE
 	Common
 	GpCommon
@@ -334,7 +334,7 @@ target_include_directories(bin2gp PRIVATE
 	)
 target_link_libraries(bin2gp PortabilityLayer)
 
-add_executable(hqx2bin hqx2bin/hqx2bin.cpp AerofoilPortable/GpAllocator_C.cpp)
+add_executable(hqx2bin EXCLUDE_FROM_ALL hqx2bin/hqx2bin.cpp AerofoilPortable/GpAllocator_C.cpp)
 target_include_directories(hqx2bin PRIVATE
 	Common
 	GpCommon
@@ -343,7 +343,7 @@ target_include_directories(hqx2bin PRIVATE
 	)
 target_link_libraries(hqx2bin PortabilityLayer)
 
-add_executable(hqx2gp
+add_executable(hqx2gp EXCLUDE_FROM_ALL
 	hqx2gp/hqx2gp.cpp
 	AerofoilPortable/GpAllocator_C.cpp
 	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
@@ -357,7 +357,7 @@ target_include_directories(hqx2gp PRIVATE
 	)
 target_link_libraries(hqx2gp PortabilityLayer)
 
-add_executable(gpr2gpa
+add_executable(gpr2gpa EXCLUDE_FROM_ALL
 	gpr2gpa/gpr2gpa.cpp
 	gpr2gpa/macedec.cpp
 	AerofoilPortable/GpAllocator_C.cpp
@@ -375,11 +375,14 @@ target_include_directories(gpr2gpa PRIVATE
 	)
 target_link_libraries(gpr2gpa PortabilityLayer MacRomanConversion zlib)
 
-add_executable(MakeTimestamp MakeTimestamp/MakeTimestamp.cpp)
+add_executable(MakeTimestamp EXCLUDE_FROM_ALL MakeTimestamp/MakeTimestamp.cpp)
 target_include_directories(MakeTimestamp PRIVATE PortabilityLayer)
 target_link_libraries(MakeTimestamp PortabilityLayer)
 
-add_executable(FTagData FTagData/FTagData.cpp WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp)
+add_executable(FTagData EXCLUDE_FROM_ALL
+	FTagData/FTagData.cpp
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
 target_include_directories(FTagData PRIVATE
 	Common
 	GpCommon
@@ -389,7 +392,7 @@ target_include_directories(FTagData PRIVATE
 	)
 target_link_libraries(FTagData PortabilityLayer)
 
-add_executable(MergeGPF
+add_executable(MergeGPF EXCLUDE_FROM_ALL
 	MergeGPF/MergeGPF.cpp
 	AerofoilPortable/GpAllocator_C.cpp
 	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
@@ -403,7 +406,7 @@ target_include_directories(MergeGPF PRIVATE
 	)
 target_link_libraries(MergeGPF PortabilityLayer)
 
-add_executable(MiniRez MiniRez/MiniRez.cpp WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp)
+add_executable(MiniRez EXCLUDE_FROM_ALL MiniRez/MiniRez.cpp WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp)
 target_include_directories(MiniRez PRIVATE
 	Common
 	GpCommon
@@ -412,7 +415,10 @@ target_include_directories(MiniRez PRIVATE
 	)
 target_link_libraries(MiniRez PortabilityLayer)
 
-add_executable(HouseTool HouseTool/HouseTool.cpp WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp)
+add_executable(HouseTool EXCLUDE_FROM_ALL
+	HouseTool/HouseTool.cpp
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
 target_include_directories(HouseTool PRIVATE
 	Common
 	GpCommon
@@ -422,7 +428,7 @@ target_include_directories(HouseTool PRIVATE
 	)
 target_link_libraries(HouseTool PortabilityLayer MacRomanConversion)
 
-add_executable(unpacktool
+add_executable(unpacktool EXCLUDE_FROM_ALL
 	unpacktool/ArchiveDescription.cpp
 	unpacktool/BWT.cpp
 	unpacktool/CompactProLZHDecompressor.cpp
@@ -473,7 +479,7 @@ if(FREETYPE_FOUND)
 	target_link_libraries(GpFontHandler_FreeType2 PRIVATE Freetype::Freetype)
 
 
-	add_executable(GenerateFonts
+	add_executable(GenerateFonts EXCLUDE_FROM_ALL
 		GenerateFonts/GenerateFonts.cpp
 		AerofoilPortable/GpAllocator_C.cpp
 		WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
@@ -488,7 +494,7 @@ if(FREETYPE_FOUND)
 	target_link_libraries(GenerateFonts PortabilityLayer GpFontHandler_FreeType2)
 endif()
 
-add_executable(ConvertColorCursors
+add_executable(ConvertColorCursors EXCLUDE_FROM_ALL
 	ConvertColorCursors/ConvertColorCursors.cpp
 	AerofoilPortable/GpAllocator_C.cpp
 	stb/stb_image_write.c
@@ -722,6 +728,19 @@ add_custom_target(Resources ALL
 		${HOUSE_FILES}
 	)
 
+set(TOOL_EXES
+	flattenmov
+	bin2gp
+	hqx2bin
+	hqx2gp
+	MakeTimestamp
+	FTagData
+	gpr2gpa
+	unpacktool
+	MergeGPF
+	)
+add_custom_target(Tools ALL DEPENDS ${TOOL_EXES})
+
 
 list(TRANSFORM DATA_FILES PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
 list(TRANSFORM HOUSE_FILES PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
@@ -729,3 +748,4 @@ list(TRANSFORM HOUSE_FILES PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
 install(TARGETS "${EXECNAME}" COMPONENT Executable)
 install(FILES ${DATA_FILES} DESTINATION lib/aerofoil/Packaged COMPONENT Resources)
 install(FILES ${HOUSE_FILES} DESTINATION lib/aerofoil/Packaged/Houses COMPONENT Resources)
+install(TARGETS ${TOOL_EXES} DESTINATION lib/aerofoil/tools COMPONENT Tools)

From 2681ffc5c6a4c451233d7974e859d5a28279c5bd Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Sat, 6 Jul 2024 13:31:42 +1200
Subject: [PATCH 28/31] Update instructions in LINUX.txt

---
 LINUX.txt | 57 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 13 deletions(-)

diff --git a/LINUX.txt b/LINUX.txt
index 6c8ecce..7dc1513 100644
--- a/LINUX.txt
+++ b/LINUX.txt
@@ -1,18 +1,49 @@
-Linux support is IN ALPHA and may or may not work.  Only Cygwin has been
-tested so far.
+Linux support is IN ALPHA and may or may not work.
 
-You can attempt the following:
-- Install CMake (https://cmake.org/download/)
-- Install SDL 2.0.12 or higher, or build it from the included source
-- Run "cmake ." in the Aerofoil source directory
-- Run "make install" to build the AerofoilX program
-- Unzip the the Windows build
-- Copy the "Packaged" and "Resources" directories from the Windows build into
-  the "lib" folder above the "bin" folder that the AerofoilX program installed
-  to.  For example, if it installed to /usr/local/bin/, then the data files
-  should go in /usr/local/lib/aerofoil/
-- Run AerofoilX
+Use these basic steps to build and install Aerofoil:
+- Ensure dependencies are installed - all of these are likely available from
+  your distribution's package manager:
+    - CMake 3.10 or later (https://cmake.org/download/)
+    - SDL 2.0.12 or later (https://libsdl.org)
+    - FreeType 2.10.1 or later (https://freetype.org/download.html)
+- Change directory to the Aerofoil source root (the directory containing this file)
+- Run "cmake -B build" to create a CMake build tree under "build"
+- Run "cmake --build build" to build the AerofoilX program and its resources
+- Run "cmake --install build" to install everything under /usr/local
+- You can now run Aerofoil with the command "AerofoilX"
 
+You can also build just the AerofoilX executable and use the prebuilt resources
+from the Windows release:
+- Follow the steps above, ignoring the FreeType dependency and stopping after
+  running "cmake -B build"
+- Run "cmake --build build --target Executable" to build only the executable
+- Run "cmake --install build --component Executable" to install AerofoilX in
+  /usr/local/bin
+- Download the Windows build from
+  https://github.com/elasota/Aerofoil/releases/latest and unzip it
+- Create the directory /usr/local/lib/aerofoil and copy the "Packaged"
+  directory from the Windows build into it
+
+To install under a prefix other than /usr/local add
+"-DCMAKE_INSTALL_PREFIX=<prefix>" to "cmake -B build"
+
+Tools for converting Glider PRO houses are installed under
+/usr/local/lib/aerofoil/tools, see Documentation/userhouses.txt for
+instructions on how to use them.
+
+The main AerofoilX executable, its required resources and the conversion tools
+can be built and installed individually via these build targets and install
+components:
+- Executable
+- Resources
+- Tools
+
+For instance, you can use
+    cmake --build build --target Executable Resources
+to build only Aerofoil and its resources, and
+    cmake --install build --component Executable
+    cmake --install build --component Resources
+to install them.
 
 Please report any issues that you experience with this to the issue tracker on
 GitHub.

From ee60ef57a103ccbc958e4a4e4b33e970afd03921 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 6 Aug 2024 03:42:11 +1200
Subject: [PATCH 29/31] Generate Packaged/Houses dirs as dependencies

Uses add_custom_command() to add rules for generating these directories,
rather than creating them only when CMakeLists.txt runs. With this
change, you can manually delete Packaged from the build directory
without causing subsequent builds to fail.
---
 CMakeLists.txt | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2335648..927f32b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -511,7 +511,11 @@ target_include_directories(ConvertColorCursors PRIVATE
 target_link_libraries(ConvertColorCursors PortabilityLayer)
 
 
-file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Packaged/Houses")
+add_custom_target(BuildDirs
+	BYPRODUCTS Packaged
+	COMMAND "${CMAKE_COMMAND}" -E make_directory Packaged/Houses
+	VERBATIM
+	)
 
 set(DATA_FILES)
 
@@ -534,6 +538,7 @@ function(add_data_file NAME)
 	add_custom_command(
 		OUTPUT "Packaged/${NAME}"
 		BYPRODUCTS ${ARG_BYPRODUCTS}
+		DEPENDS BuildDirs
 		${ARG_COMMANDS}
 		${RM_BYPRODUCTS_COMMAND} ${RM_BYPRODUCTS_PATHS}
 		VERBATIM
@@ -646,7 +651,7 @@ function(add_house NAME)
 			"${BASE_PATH}.gpf"
 		BYPRODUCTS
 			${BYPRODUCTS}
-		DEPENDS hqx2gp gpr2gpa MergeGPF
+		DEPENDS hqx2gp gpr2gpa MergeGPF BuildDirs
 		COMMAND hqx2gp
 			"${CMAKE_SOURCE_DIR}/GliderProData/Houses/${NAME}.binhex"
 			"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
@@ -673,7 +678,7 @@ function(add_house NAME)
 				"${BASE_PATH}.mov.gpf"
 			BYPRODUCTS
 				"${BASE_PATH}.mov.gpa"
-			DEPENDS FTagData MergeGPF "${MOV_GPA_SRC}"
+			DEPENDS FTagData MergeGPF BuildDirs "${MOV_GPA_SRC}"
 			COMMAND FTagData
 				"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
 				"${BASE_PATH}.mov.gpf"

From c8e3e8683b7336c345aec09a5b8512733be51c6b Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 6 Aug 2024 16:20:01 +1200
Subject: [PATCH 30/31] Add deps in source tree to resource targets

This will make CMake rebuild resources if for instance the fonts are
updated.
---
 CMakeLists.txt | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 927f32b..170862a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -550,7 +550,9 @@ add_data_file(ApplicationResources.gpf
 		Packaged/ApplicationResources.gpr
 		Packaged/ApplicationResources.gpa
 	COMMANDS
-	DEPENDS MiniRez gpr2gpa FTagData MergeGPF
+	DEPENDS
+		MiniRez gpr2gpa FTagData MergeGPF "GliderProData/Glider PRO.r"
+		ApplicationResourcePatches/manifest.json DefaultTimestamp.timestamp
 	COMMAND MiniRez
 		"GliderProData/Glider PRO.r"
 		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpr"
@@ -568,6 +570,7 @@ add_data_file(ApplicationResources.gpf
 	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 	)
 
+file(GLOB_RECURSE FONT_DEPS RELATIVE "${CMAKE_SOURCE_DIR}" CONFIGURE_DEPENDS Resources/Fonts/*)
 add_data_file(Fonts.gpf
 	BYPRODUCTS
 		Packaged/Fonts.gpr
@@ -590,7 +593,7 @@ add_data_file(Fonts.gpf
 		Packaged/CachedFont13.bin
 		Packaged/CachedFont14.bin
 	COMMANDS
-	DEPENDS GenerateFonts MiniRez gpr2gpa FTagData MergeGPF
+	DEPENDS GenerateFonts MiniRez gpr2gpa FTagData MergeGPF ${FONT_DEPS}
 	COMMAND GenerateFonts "${CMAKE_SOURCE_DIR}/Resources" Packaged
 	COMMAND MiniRez "${CMAKE_SOURCE_DIR}/Empty.r" Packaged/Fonts.gpr
 	COMMAND gpr2gpa
@@ -645,20 +648,22 @@ function(add_house NAME)
 	list(APPEND HOUSE_FILES "${BASE_PATH}.gpf")
 
 	set(BYPRODUCTS "${BASE_PATH}.gpr" "${BASE_PATH}.gpa" "${BASE_PATH}.gpd")
+	set(BINHEX_SRC "${CMAKE_SOURCE_DIR}/GliderProData/Houses/${NAME}.binhex")
+	set(TS "${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp")
 
 	add_custom_command(
 		OUTPUT
 			"${BASE_PATH}.gpf"
 		BYPRODUCTS
 			${BYPRODUCTS}
-		DEPENDS hqx2gp gpr2gpa MergeGPF BuildDirs
+		DEPENDS hqx2gp gpr2gpa MergeGPF BuildDirs "${BINHEX_SRC}" "${TS}"
 		COMMAND hqx2gp
-			"${CMAKE_SOURCE_DIR}/GliderProData/Houses/${NAME}.binhex"
-			"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
+			"${BINHEX_SRC}"
+			"${TS}"
 			"${BASE_PATH}"
 		COMMAND gpr2gpa
 			"${BASE_PATH}.gpr"
-			"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
+			"${TS}"
 			"${BASE_PATH}.gpa"
 			${PATCH_ARGS}
 		${HOUSE_EXTRA_COMMANDS}
@@ -678,9 +683,9 @@ function(add_house NAME)
 				"${BASE_PATH}.mov.gpf"
 			BYPRODUCTS
 				"${BASE_PATH}.mov.gpa"
-			DEPENDS FTagData MergeGPF BuildDirs "${MOV_GPA_SRC}"
+			DEPENDS FTagData MergeGPF BuildDirs "${MOV_GPA_SRC}" "${TS}"
 			COMMAND FTagData
-				"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
+				"${TS}"
 				"${BASE_PATH}.mov.gpf"
 				MooV ozm5 0 0 locked
 			COMMAND "${CMAKE_COMMAND}" -E copy

From ed4eb8e1f79b9f37739aae313baa408f898b5719 Mon Sep 17 00:00:00 2001
From: Diomendius <42310725+Diomendius@users.noreply.github.com>
Date: Tue, 6 Aug 2024 17:28:25 +1200
Subject: [PATCH 31/31] Use temporary staging dirs when building resources

This allows intermediate build artifacts to be cleaned up without
specifying them individually as BYPRODUCTS.

When building a data file <name>, all files are first built under
tmp/<name> before the target itself is moved from tmp/<name>/<name> to
Packaged/<name>.

add_house_file() could also be modified in this way, but it wouldn't
reduce the boilerplate by much, so it's probably not worth it.
---
 CMakeLists.txt | 76 ++++++++++++++++----------------------------------
 1 file changed, 24 insertions(+), 52 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 170862a..e35328f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -512,8 +512,8 @@ target_link_libraries(ConvertColorCursors PortabilityLayer)
 
 
 add_custom_target(BuildDirs
-	BYPRODUCTS Packaged
-	COMMAND "${CMAKE_COMMAND}" -E make_directory Packaged/Houses
+	BYPRODUCTS Packaged tmp
+	COMMAND "${CMAKE_COMMAND}" -E make_directory Packaged/Houses tmp
 	VERBATIM
 	)
 
@@ -523,89 +523,61 @@ function(add_data_file NAME)
 	list(APPEND DATA_FILES "Packaged/${NAME}")
 	set(DATA_FILES "${DATA_FILES}" PARENT_SCOPE)
 
-	cmake_parse_arguments(PARSE_ARGV 1 ARG
-		""
-		""
-		"BYPRODUCTS;COMMANDS"
+	cmake_parse_arguments(PARSE_ARGV 1 ARG "" "" "")
+	set(TMPDIR "${CMAKE_CURRENT_BINARY_DIR}/tmp/${NAME}")
+	list(TRANSFORM ARG_UNPARSED_ARGUMENTS
+		REPLACE {TMPDIR} "${TMPDIR}"
 		)
 
-	if(ARG_BYPRODUCTS)
-		set(RM_BYPRODUCTS_COMMAND COMMAND "${CMAKE_COMMAND}" -E rm)
-		set(RM_BYPRODUCTS_PATHS "${ARG_BYPRODUCTS}")
-		list(TRANSFORM RM_BYPRODUCTS_PATHS PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
-	endif()
-
 	add_custom_command(
 		OUTPUT "Packaged/${NAME}"
-		BYPRODUCTS ${ARG_BYPRODUCTS}
 		DEPENDS BuildDirs
-		${ARG_COMMANDS}
-		${RM_BYPRODUCTS_COMMAND} ${RM_BYPRODUCTS_PATHS}
+		COMMAND "${CMAKE_COMMAND}" -E make_directory "${TMPDIR}"
+		${ARG_UNPARSED_ARGUMENTS}
+		COMMAND "${CMAKE_COMMAND}" -E rename
+			"${TMPDIR}/${NAME}"
+			"${CMAKE_CURRENT_BINARY_DIR}/Packaged/${NAME}"
+		COMMAND "${CMAKE_COMMAND}" -E rm -r -- "${TMPDIR}"
 		VERBATIM
 		)
 endfunction()
 
 add_data_file(ApplicationResources.gpf
-	BYPRODUCTS
-		Packaged/ApplicationResources.gpr
-		Packaged/ApplicationResources.gpa
-	COMMANDS
 	DEPENDS
 		MiniRez gpr2gpa FTagData MergeGPF "GliderProData/Glider PRO.r"
 		ApplicationResourcePatches/manifest.json DefaultTimestamp.timestamp
 	COMMAND MiniRez
 		"GliderProData/Glider PRO.r"
-		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpr"
+		"{TMPDIR}/ApplicationResources.gpr"
 	COMMAND gpr2gpa
-		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpr"
+		"{TMPDIR}/ApplicationResources.gpr"
 		DefaultTimestamp.timestamp
-		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpa"
+		"{TMPDIR}/ApplicationResources.gpa"
 		-patch ApplicationResourcePatches/manifest.json
 	COMMAND FTagData
 		DefaultTimestamp.timestamp
-		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpf"
+		"{TMPDIR}/ApplicationResources.gpf"
 		data ozm5 0 0 locked
 	COMMAND MergeGPF
-		"${CMAKE_CURRENT_BINARY_DIR}/Packaged/ApplicationResources.gpf"
+		"{TMPDIR}/ApplicationResources.gpf"
 	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 	)
 
 file(GLOB_RECURSE FONT_DEPS RELATIVE "${CMAKE_SOURCE_DIR}" CONFIGURE_DEPENDS Resources/Fonts/*)
 add_data_file(Fonts.gpf
-	BYPRODUCTS
-		Packaged/Fonts.gpr
-		Packaged/Fonts.gpa
-		Packaged/FontCacheCatalog.bin
-		Packaged/FontCacheManifest.json
-		Packaged/CachedFont0.bin
-		Packaged/CachedFont1.bin
-		Packaged/CachedFont2.bin
-		Packaged/CachedFont3.bin
-		Packaged/CachedFont4.bin
-		Packaged/CachedFont5.bin
-		Packaged/CachedFont6.bin
-		Packaged/CachedFont7.bin
-		Packaged/CachedFont8.bin
-		Packaged/CachedFont9.bin
-		Packaged/CachedFont10.bin
-		Packaged/CachedFont11.bin
-		Packaged/CachedFont12.bin
-		Packaged/CachedFont13.bin
-		Packaged/CachedFont14.bin
-	COMMANDS
 	DEPENDS GenerateFonts MiniRez gpr2gpa FTagData MergeGPF ${FONT_DEPS}
-	COMMAND GenerateFonts "${CMAKE_SOURCE_DIR}/Resources" Packaged
-	COMMAND MiniRez "${CMAKE_SOURCE_DIR}/Empty.r" Packaged/Fonts.gpr
+	COMMAND GenerateFonts "${CMAKE_SOURCE_DIR}/Resources" {TMPDIR}
+	COMMAND MiniRez "${CMAKE_SOURCE_DIR}/Empty.r" {TMPDIR}/Fonts.gpr
 	COMMAND gpr2gpa
-		Packaged/Fonts.gpr
+		{TMPDIR}/Fonts.gpr
 		"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
-		Packaged/Fonts.gpa
-		-patch Packaged/FontCacheManifest.json
+		{TMPDIR}/Fonts.gpa
+		-patch {TMPDIR}/FontCacheManifest.json
 	COMMAND FTagData
 		DefaultTimestamp.timestamp
-		Packaged/Fonts.gpf
+		{TMPDIR}/Fonts.gpf
 		data ozm5 0 0 locked
-	COMMAND MergeGPF Packaged/Fonts.gpf
+	COMMAND MergeGPF {TMPDIR}/Fonts.gpf
 	)
 
 # These files are committed to the repo and aren't currently useful on non-Windows systems anyway.