Merge pull request #25 from fpiesche/master

Optimise icon SVG and merge releases.xml into main metainfo

.editorconfig

@@ -1,10 +1,10 @@
-root=true
-
-[*.{h,c,cpp}]
-indent_style=tab
-indent_size=4
-tab_width=4
-end_of_line=lf
-charset=latin1
-trim_trailing_whitespace=true
-insert_final_newline=true
+root=true
+
+[*.{h,c,cpp}]
+indent_style=tab
+indent_size=4
+tab_width=4
+end_of_line=lf
+charset=latin1
+trim_trailing_whitespace=true
+insert_final_newline=true

.gitattributes

@@ -0,0 +1,31 @@
+.editorconfig text
+.gitattributes text
+.gitignore text
+.gitmodules text
+
+*.txt text
+
+*.cmake text
+Makefile text
+README text
+
+*.bat text eol=crlf
+
+*.c text
+*.cpp text
+*.h text
+*.mm text
+
+*.gradle text
+*.java text
+*.mk text
+
+*.xml text
+*.html text
+
+*.json text
+
+# These files get packaged into ApplicationResources.gpf, so ensure
+# they get consistent line endings for reproducibility.
+/ApplicationResourcePatches/**/*.json eol=lf
+/ApplicationResourcePatches/**/*.txt eol=lf

.gitignore

@@ -1,67 +1,67 @@
-*.suo
-*.db
-*.opendb
-*.ipch
-*.iobj
-*.ipdb
-*.pch
-*.user
-*.mcp
-*.obj
-*.log
-*.tlog
-*.lastbuildstate
-*.dll
-*.exe
-*.exp
-*.ilk
-*.lib
-*.pdb
-*.idb
-*.aps
-*.res
-*.a
-*.recipe
-*.FileListAbsolute.txt
-.vs/*
-Packaged/*
-DebugData/*
-ReleasePkg/*
-InstallerPackages/*
-*.msi
-*.wixpdb
-*.wixobj
-*.CopyComplete
-*.lnk
-*.cmake
-ReleasePackageInstaller/obj/*
-ReleasePackageInstaller/bin/*
-ReleasePackageInstaller/AerofoilPackageDefs.wxi
-ReleasePackageInstaller/AerofoilPackageVersion.wxi
-packages/*
-!SDL2-2.0.12/lib/x64/*
-CMakeCache.txt
-CMakeFiles/*
-Makefile
-SDL2-2.0.12/CMakeFiles/*
-SDL2-2.0.12/build
-SDL2-2.0.12/config.status
-SDL2-2.0.12/libtool
-SDL2-2.0.12/Makefile.rules
-SDL2-2.0.12/sdl2.pc
-SDL2-2.0.12/sdl2-config
-install_manifest.txt
-
+*.suo
+*.db
+*.opendb
+*.ipch
+*.iobj
+*.ipdb
+*.pch
+*.user
+*.mcp
+*.obj
+*.log
+*.tlog
+*.lastbuildstate
+*.dll
+*.exe
+*.exp
+*.ilk
+*.lib
+*.pdb
+*.idb
+*.aps
+*.res
+*.a
+*.recipe
+*.FileListAbsolute.txt
+.vs/*
+Packaged/*
+DebugData/*
+ReleasePkg/*
+InstallerPackages/*
+*.msi
+*.wixpdb
+*.wixobj
+*.CopyComplete
+*.lnk
+ReleasePackageInstaller/obj/*
+ReleasePackageInstaller/bin/*
+ReleasePackageInstaller/AerofoilPackageDefs.wxi
+ReleasePackageInstaller/AerofoilPackageVersion.wxi
+packages/*
+!SDL2-2.30.5/lib/x64/*
+CMakeCache.txt
+CMakeFiles/*
+Makefile
+SDL2-2.30.5/CMakeFiles/*
+SDL2-2.30.5/build
+SDL2-2.30.5/config.status
+SDL2-2.30.5/libtool
+SDL2-2.30.5/Makefile.rules
+SDL2-2.30.5/sdl2.pc
+SDL2-2.30.5/sdl2-config
+SDL2-2.30.5/test/*
+install_manifest.txt
+
 ## macOS
 .DS_Store
-
-## Xcode projects
-AerofoilMac/xcuserdata/
-AerofoilMac/*.xcodeproj/xcuserdata/
-AerofoilMac/build/
-AerofoilMac/DerivedData/
-*.xcuserstate
-SDL2-2.0.12/Xcode/SDL/SDL.xcodeproj/xcuserdata/*
-AerofoilMac/Resources/*.gpf
-AerofoilMac/Resources/Houses/*.gpf
+
+## Xcode projects
+AerofoilMac/xcuserdata/
+AerofoilMac/*.xcodeproj/xcuserdata/
+AerofoilMac/build/
+AerofoilMac/DerivedData/
+*.xcuserstate
+SDL2-2.30.5/Xcode/SDL/SDL.xcodeproj/xcuserdata/*
+AerofoilMac/Resources/*.gpf
+AerofoilMac/Resources/Houses/*.gpf
 AerofoilMac/*.xcodeproj/project.xcworkspace/xcuserdata

ASADTool/ASADTool.cpp

@@ -72,7 +72,7 @@ int ProcessFileDatesInfo(FILE *f, uint32_t length, PortabilityLayer::MacFileProp
 		return -1;
 	}
 
-	const int64_t asEpochToMacEpoch = -3029547600LL;
+	const int64_t asEpochToMacEpoch = 3029547600LL;
 
 	// Mac epoch in Unix time: -2082844800
 	// ASAD epoch in Unix time: 946702800

ASADTool/ASADTool.vcxproj

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -20,13 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -43,6 +64,14 @@
     <Import Project="..\GpCommon.props" />
     <Import Project="..\Common.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\Debug.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Common.props" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\Release.props" />
@@ -51,6 +80,14 @@
     <Import Project="..\GpCommon.props" />
     <Import Project="..\Common.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\Release.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Common.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -68,6 +105,21 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -79,6 +131,17 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="..\PortabilityLayer\PortabilityLayer.vcxproj">
       <Project>{6ec62b0f-9353-40a4-a510-3788f1368b33}</Project>

Aerofoil.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34607.119
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hqx2bin", "hqx2bin\hqx2bin.vcxproj", "{45B1B18C-C846-4044-9206-74F58DFC5E88}"
 EndProject
@@ -75,132 +75,377 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASADTool", "ASADTool\ASADTo
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Debug|Win32.ActiveCfg = Debug|Win32
+		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Debug|Win32.Build.0 = Debug|Win32
 		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Debug|x64.ActiveCfg = Debug|x64
 		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Debug|x64.Build.0 = Debug|x64
+		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Debug|x86.ActiveCfg = Debug|Win32
+		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Debug|x86.Build.0 = Debug|Win32
+		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Release|Win32.ActiveCfg = Release|Win32
+		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Release|Win32.Build.0 = Release|Win32
 		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Release|x64.ActiveCfg = Release|x64
 		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Release|x64.Build.0 = Release|x64
+		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Release|x86.ActiveCfg = Release|Win32
+		{45B1B18C-C846-4044-9206-74F58DFC5E88}.Release|x86.Build.0 = Release|Win32
+		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Debug|Win32.Build.0 = Debug|Win32
 		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Debug|x64.ActiveCfg = Debug|x64
 		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Debug|x64.Build.0 = Debug|x64
+		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Debug|x86.ActiveCfg = Debug|Win32
+		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Debug|x86.Build.0 = Debug|Win32
+		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Release|Win32.ActiveCfg = Release|Win32
+		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Release|Win32.Build.0 = Release|Win32
 		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Release|x64.ActiveCfg = Release|x64
 		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Release|x64.Build.0 = Release|x64
+		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Release|x86.ActiveCfg = Release|Win32
+		{6EC62B0F-9353-40A4-A510-3788F1368B33}.Release|x86.Build.0 = Release|Win32
+		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Debug|Win32.Build.0 = Debug|Win32
 		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Debug|x64.ActiveCfg = Debug|x64
 		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Debug|x64.Build.0 = Debug|x64
+		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Debug|x86.ActiveCfg = Debug|Win32
+		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Debug|x86.Build.0 = Debug|Win32
+		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Release|Win32.ActiveCfg = Release|Win32
+		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Release|Win32.Build.0 = Release|Win32
 		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Release|x64.ActiveCfg = Release|x64
 		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Release|x64.Build.0 = Release|x64
+		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Release|x86.ActiveCfg = Release|Win32
+		{2FF15659-5C72-48B8-B55B-3C658E4125B5}.Release|x86.Build.0 = Release|Win32
+		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Debug|Win32.Build.0 = Debug|Win32
 		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Debug|x64.ActiveCfg = Debug|x64
 		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Debug|x64.Build.0 = Debug|x64
+		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Debug|x86.ActiveCfg = Debug|Win32
+		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Debug|x86.Build.0 = Debug|Win32
+		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Release|Win32.ActiveCfg = Release|Win32
+		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Release|Win32.Build.0 = Release|Win32
 		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Release|x64.ActiveCfg = Release|x64
 		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Release|x64.Build.0 = Release|x64
+		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Release|x86.ActiveCfg = Release|Win32
+		{6233C3F2-5781-488E-B190-4FA8836F5A77}.Release|x86.Build.0 = Release|Win32
+		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Debug|Win32.Build.0 = Debug|Win32
 		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Debug|x64.ActiveCfg = Debug|x64
 		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Debug|x64.Build.0 = Debug|x64
+		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Debug|x86.ActiveCfg = Debug|Win32
+		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Debug|x86.Build.0 = Debug|Win32
+		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Release|Win32.ActiveCfg = Release|Win32
+		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Release|Win32.Build.0 = Release|Win32
 		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Release|x64.ActiveCfg = Release|x64
 		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Release|x64.Build.0 = Release|x64
+		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Release|x86.ActiveCfg = Release|Win32
+		{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Release|x86.Build.0 = Release|Win32
+		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Debug|Win32.Build.0 = Debug|Win32
 		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Debug|x64.ActiveCfg = Debug|x64
 		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Debug|x64.Build.0 = Debug|x64
+		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Debug|x86.ActiveCfg = Debug|Win32
+		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Debug|x86.Build.0 = Debug|Win32
+		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Release|Win32.ActiveCfg = Release|Win32
+		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Release|Win32.Build.0 = Release|Win32
 		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Release|x64.ActiveCfg = Release|x64
 		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Release|x64.Build.0 = Release|x64
+		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Release|x86.ActiveCfg = Release|Win32
+		{E3BDC783-8646-433E-ADF0-8B6390D36669}.Release|x86.Build.0 = Release|Win32
+		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Debug|Win32.Build.0 = Debug|Win32
 		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Debug|x64.ActiveCfg = Debug|x64
 		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Debug|x64.Build.0 = Debug|x64
+		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Debug|x86.ActiveCfg = Debug|Win32
+		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Debug|x86.Build.0 = Debug|Win32
+		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Release|Win32.ActiveCfg = Release|Win32
+		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Release|Win32.Build.0 = Release|Win32
 		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Release|x64.ActiveCfg = Release|x64
 		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Release|x64.Build.0 = Release|x64
+		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Release|x86.ActiveCfg = Release|Win32
+		{A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3}.Release|x86.Build.0 = Release|Win32
+		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Debug|Win32.Build.0 = Debug|Win32
 		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Debug|x64.ActiveCfg = Debug|x64
 		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Debug|x64.Build.0 = Debug|x64
+		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Debug|x86.ActiveCfg = Debug|Win32
+		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Debug|x86.Build.0 = Debug|Win32
+		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Release|Win32.ActiveCfg = Release|Win32
+		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Release|Win32.Build.0 = Release|Win32
 		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Release|x64.ActiveCfg = Release|x64
 		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Release|x64.Build.0 = Release|x64
+		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Release|x86.ActiveCfg = Release|Win32
+		{487216D8-16BA-4B4C-B5BF-43FEEDFEE03A}.Release|x86.Build.0 = Release|Win32
+		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Debug|Win32.Build.0 = Debug|Win32
 		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Debug|x64.ActiveCfg = Debug|x64
 		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Debug|x64.Build.0 = Debug|x64
+		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Debug|x86.ActiveCfg = Debug|Win32
+		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Debug|x86.Build.0 = Debug|Win32
+		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Release|Win32.ActiveCfg = Release|Win32
+		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Release|Win32.Build.0 = Release|Win32
 		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Release|x64.ActiveCfg = Release|x64
 		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Release|x64.Build.0 = Release|x64
+		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Release|x86.ActiveCfg = Release|Win32
+		{ED2F91E1-673A-4590-82B2-EB157927D3E3}.Release|x86.Build.0 = Release|Win32
+		{B852D549-4020-4477-8BFB-E199FF78B047}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B852D549-4020-4477-8BFB-E199FF78B047}.Debug|Win32.Build.0 = Debug|Win32
 		{B852D549-4020-4477-8BFB-E199FF78B047}.Debug|x64.ActiveCfg = Debug|x64
 		{B852D549-4020-4477-8BFB-E199FF78B047}.Debug|x64.Build.0 = Debug|x64
+		{B852D549-4020-4477-8BFB-E199FF78B047}.Debug|x86.ActiveCfg = Debug|Win32
+		{B852D549-4020-4477-8BFB-E199FF78B047}.Debug|x86.Build.0 = Debug|Win32
+		{B852D549-4020-4477-8BFB-E199FF78B047}.Release|Win32.ActiveCfg = Release|Win32
+		{B852D549-4020-4477-8BFB-E199FF78B047}.Release|Win32.Build.0 = Release|Win32
 		{B852D549-4020-4477-8BFB-E199FF78B047}.Release|x64.ActiveCfg = Release|x64
 		{B852D549-4020-4477-8BFB-E199FF78B047}.Release|x64.Build.0 = Release|x64
+		{B852D549-4020-4477-8BFB-E199FF78B047}.Release|x86.ActiveCfg = Release|Win32
+		{B852D549-4020-4477-8BFB-E199FF78B047}.Release|x86.Build.0 = Release|Win32
+		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Debug|Win32.Build.0 = Debug|Win32
 		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Debug|x64.ActiveCfg = Debug|x64
 		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Debug|x64.Build.0 = Debug|x64
+		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Debug|x86.ActiveCfg = Debug|Win32
+		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Debug|x86.Build.0 = Debug|Win32
+		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Release|Win32.ActiveCfg = Release|Win32
+		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Release|Win32.Build.0 = Release|Win32
 		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Release|x64.ActiveCfg = Release|x64
 		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Release|x64.Build.0 = Release|x64
+		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Release|x86.ActiveCfg = Release|Win32
+		{FFC961AC-55B4-4A38-A83E-06AE98F59ACC}.Release|x86.Build.0 = Release|Win32
+		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Debug|Win32.ActiveCfg = Debug|Win32
+		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Debug|Win32.Build.0 = Debug|Win32
 		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Debug|x64.ActiveCfg = Debug|x64
 		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Debug|x64.Build.0 = Debug|x64
+		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Debug|x86.ActiveCfg = Debug|Win32
+		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Debug|x86.Build.0 = Debug|Win32
+		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Release|Win32.ActiveCfg = Release|Win32
+		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Release|Win32.Build.0 = Release|Win32
 		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Release|x64.ActiveCfg = Release|x64
 		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Release|x64.Build.0 = Release|x64
+		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Release|x86.ActiveCfg = Release|Win32
+		{17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Release|x86.Build.0 = Release|Win32
+		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|Win32.Build.0 = Debug|Win32
 		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x64.ActiveCfg = Debug|x64
 		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x64.Build.0 = Debug|x64
+		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x86.ActiveCfg = Debug|Win32
+		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x86.Build.0 = Debug|Win32
+		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|Win32.ActiveCfg = Release|Win32
+		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|Win32.Build.0 = Release|Win32
 		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x64.ActiveCfg = Release|x64
 		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x64.Build.0 = Release|x64
+		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x86.ActiveCfg = Release|Win32
+		{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x86.Build.0 = Release|Win32
+		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Debug|Win32.Build.0 = Debug|Win32
 		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Debug|x64.ActiveCfg = Debug|x64
 		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Debug|x64.Build.0 = Debug|x64
+		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Debug|x86.ActiveCfg = Debug|Win32
+		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Debug|x86.Build.0 = Debug|Win32
+		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Release|Win32.ActiveCfg = Release|Win32
+		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Release|Win32.Build.0 = Release|Win32
 		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Release|x64.ActiveCfg = Release|x64
 		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Release|x64.Build.0 = Release|x64
+		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Release|x86.ActiveCfg = Release|Win32
+		{07351A8E-1F79-42C9-BBAB-31F071EAA99E}.Release|x86.Build.0 = Release|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|Win32.Build.0 = Debug|Win32
 		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|x64.ActiveCfg = Debug|x64
 		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|x64.Build.0 = Debug|x64
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|x86.ActiveCfg = Debug|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Debug|x86.Build.0 = Debug|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|Win32.ActiveCfg = Release|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|Win32.Build.0 = Release|Win32
 		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|x64.ActiveCfg = Release|x64
 		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|x64.Build.0 = Release|x64
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|x86.ActiveCfg = Release|Win32
+		{27B7CA46-ED23-45C2-BF5F-0C126D81AEBF}.Release|x86.Build.0 = Release|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|Win32.Build.0 = Debug|Win32
 		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|x64.ActiveCfg = Debug|x64
 		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|x64.Build.0 = Debug|x64
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|x86.ActiveCfg = Debug|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Debug|x86.Build.0 = Debug|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|Win32.ActiveCfg = Release|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|Win32.Build.0 = Release|Win32
 		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|x64.ActiveCfg = Release|x64
 		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|x64.Build.0 = Release|x64
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|x86.ActiveCfg = Release|Win32
+		{6AE5C85E-6631-4A12-97A0-A05F812FE9CA}.Release|x86.Build.0 = Release|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|Win32.Build.0 = Debug|Win32
 		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|x64.ActiveCfg = Debug|x64
 		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|x64.Build.0 = Debug|x64
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|x86.ActiveCfg = Debug|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Debug|x86.Build.0 = Debug|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|Win32.ActiveCfg = Release|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|Win32.Build.0 = Release|Win32
 		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|x64.ActiveCfg = Release|x64
 		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|x64.Build.0 = Release|x64
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|x86.ActiveCfg = Release|Win32
+		{D7BFE702-0667-4155-9B0B-2A54DF9AE60B}.Release|x86.Build.0 = Release|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|Win32.Build.0 = Debug|Win32
 		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|x64.ActiveCfg = Debug|x64
 		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|x64.Build.0 = Debug|x64
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|x86.ActiveCfg = Debug|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Debug|x86.Build.0 = Debug|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|Win32.ActiveCfg = Release|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|Win32.Build.0 = Release|Win32
 		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|x64.ActiveCfg = Release|x64
 		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|x64.Build.0 = Release|x64
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|x86.ActiveCfg = Release|Win32
+		{9023DF2F-A33D-485A-B13D-0973348B2F9B}.Release|x86.Build.0 = Release|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|Win32.ActiveCfg = Debug|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|Win32.Build.0 = Debug|Win32
 		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|x64.ActiveCfg = Debug|x64
 		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|x64.Build.0 = Debug|x64
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|x86.ActiveCfg = Debug|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Debug|x86.Build.0 = Debug|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|Win32.ActiveCfg = Release|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|Win32.Build.0 = Release|Win32
 		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|x64.ActiveCfg = Release|x64
 		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|x64.Build.0 = Release|x64
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|x86.ActiveCfg = Release|Win32
+		{89F8D13E-F216-4B67-8DE9-7F842D349E94}.Release|x86.Build.0 = Release|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|Win32.Build.0 = Debug|Win32
 		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|x64.ActiveCfg = Debug|x64
 		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|x64.Build.0 = Debug|x64
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|x86.ActiveCfg = Debug|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Debug|x86.Build.0 = Debug|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|Win32.ActiveCfg = Release|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|Win32.Build.0 = Release|Win32
 		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x64.ActiveCfg = Release|x64
 		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x64.Build.0 = Release|x64
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x86.ActiveCfg = Release|Win32
+		{A778D062-DE76-49F6-8D05-EB26852DD605}.Release|x86.Build.0 = Release|Win32
+		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Debug|Win32.ActiveCfg = Debug|x64
 		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Debug|x64.ActiveCfg = Debug|x64
+		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Debug|x86.ActiveCfg = Debug|x64
+		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Release|Win32.ActiveCfg = Release|x64
 		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Release|x64.ActiveCfg = Release|x64
+		{D26BD501-28A7-4849-8130-FB5EA0A2B82F}.Release|x86.ActiveCfg = Release|x64
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|Win32.Build.0 = Debug|Win32
 		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|x64.ActiveCfg = Debug|x64
 		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|x64.Build.0 = Debug|x64
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|x86.ActiveCfg = Debug|Win32
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Debug|x86.Build.0 = Debug|Win32
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|Win32.ActiveCfg = Release|Win32
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|Win32.Build.0 = Release|Win32
 		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|x64.ActiveCfg = Release|x64
 		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|x64.Build.0 = Release|x64
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|x86.ActiveCfg = Release|Win32
+		{15009625-1120-405E-8BBA-69A16CD6713D}.Release|x86.Build.0 = Release|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|Win32.Build.0 = Debug|Win32
 		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|x64.ActiveCfg = Debug|x64
 		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|x64.Build.0 = Debug|x64
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|x86.ActiveCfg = Debug|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Debug|x86.Build.0 = Debug|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|Win32.ActiveCfg = Release|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|Win32.Build.0 = Release|Win32
 		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|x64.ActiveCfg = Release|x64
 		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|x64.Build.0 = Release|x64
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|x86.ActiveCfg = Release|Win32
+		{7EFF1E21-C375-45EA-A069-4E2232C8A72B}.Release|x86.Build.0 = Release|Win32
+		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Debug|Win32.Build.0 = Debug|Win32
 		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Debug|x64.ActiveCfg = Debug|x64
 		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Debug|x64.Build.0 = Debug|x64
+		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Debug|x86.ActiveCfg = Debug|Win32
+		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Debug|x86.Build.0 = Debug|Win32
+		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Release|Win32.ActiveCfg = Release|Win32
+		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Release|Win32.Build.0 = Release|Win32
 		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Release|x64.ActiveCfg = Release|x64
 		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Release|x64.Build.0 = Release|x64
+		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Release|x86.ActiveCfg = Release|Win32
+		{10CF9B5F-61D0-4B5B-89F4-810B58FC053D}.Release|x86.Build.0 = Release|Win32
+		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Debug|Win32.Build.0 = Debug|Win32
 		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Debug|x64.ActiveCfg = Debug|x64
 		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Debug|x64.Build.0 = Debug|x64
+		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Debug|x86.ActiveCfg = Debug|Win32
+		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Debug|x86.Build.0 = Debug|Win32
+		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Release|Win32.ActiveCfg = Release|Win32
+		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Release|Win32.Build.0 = Release|Win32
 		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Release|x64.ActiveCfg = Release|x64
 		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Release|x64.Build.0 = Release|x64
+		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Release|x86.ActiveCfg = Release|Win32
+		{4B564030-8985-4975-91E1-E1B2C16AE2A1}.Release|x86.Build.0 = Release|Win32
+		{33542FF0-0473-4802-BC79-3B8261790F65}.Debug|Win32.ActiveCfg = Debug|x64
 		{33542FF0-0473-4802-BC79-3B8261790F65}.Debug|x64.ActiveCfg = Debug|x64
 		{33542FF0-0473-4802-BC79-3B8261790F65}.Debug|x64.Build.0 = Debug|x64
+		{33542FF0-0473-4802-BC79-3B8261790F65}.Debug|x86.ActiveCfg = Debug|x64
+		{33542FF0-0473-4802-BC79-3B8261790F65}.Release|Win32.ActiveCfg = Release|x64
 		{33542FF0-0473-4802-BC79-3B8261790F65}.Release|x64.ActiveCfg = Release|x64
 		{33542FF0-0473-4802-BC79-3B8261790F65}.Release|x64.Build.0 = Release|x64
+		{33542FF0-0473-4802-BC79-3B8261790F65}.Release|x86.ActiveCfg = Release|Win32
+		{33542FF0-0473-4802-BC79-3B8261790F65}.Release|x86.Build.0 = Release|Win32
+		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Debug|Win32.ActiveCfg = Debug|Win32
+		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Debug|Win32.Build.0 = Debug|Win32
 		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Debug|x64.ActiveCfg = Debug|x64
 		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Debug|x64.Build.0 = Debug|x64
+		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Debug|x86.ActiveCfg = Debug|Win32
+		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Debug|x86.Build.0 = Debug|Win32
+		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Release|Win32.ActiveCfg = Release|Win32
+		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Release|Win32.Build.0 = Release|Win32
 		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Release|x64.ActiveCfg = Release|x64
 		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Release|x64.Build.0 = Release|x64
+		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Release|x86.ActiveCfg = Release|Win32
+		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653}.Release|x86.Build.0 = Release|Win32
+		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Debug|Win32.Build.0 = Debug|Win32
 		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Debug|x64.ActiveCfg = Debug|x64
 		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Debug|x64.Build.0 = Debug|x64
+		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Debug|x86.ActiveCfg = Debug|Win32
+		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Debug|x86.Build.0 = Debug|Win32
+		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Release|Win32.ActiveCfg = Release|Win32
+		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Release|Win32.Build.0 = Release|Win32
 		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Release|x64.ActiveCfg = Release|x64
 		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Release|x64.Build.0 = Release|x64
+		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Release|x86.ActiveCfg = Release|Win32
+		{3B7FD18D-7A50-4DF5-AC25-543E539BFACE}.Release|x86.Build.0 = Release|Win32
+		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Debug|Win32.Build.0 = Debug|Win32
 		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Debug|x64.ActiveCfg = Debug|x64
 		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Debug|x64.Build.0 = Debug|x64
+		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Debug|x86.ActiveCfg = Debug|Win32
+		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Debug|x86.Build.0 = Debug|Win32
+		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Release|Win32.ActiveCfg = Release|Win32
+		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Release|Win32.Build.0 = Release|Win32
 		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Release|x64.ActiveCfg = Release|x64
 		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Release|x64.Build.0 = Release|x64
+		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Release|x86.ActiveCfg = Release|Win32
+		{D045F28D-F245-44DD-B576-CC91BF3BE6E9}.Release|x86.Build.0 = Release|Win32
+		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Debug|Win32.Build.0 = Debug|Win32
 		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Debug|x64.ActiveCfg = Debug|x64
 		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Debug|x64.Build.0 = Debug|x64
+		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Debug|x86.ActiveCfg = Debug|Win32
+		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Debug|x86.Build.0 = Debug|Win32
+		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Release|Win32.ActiveCfg = Release|Win32
+		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Release|Win32.Build.0 = Release|Win32
 		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Release|x64.ActiveCfg = Release|x64
 		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Release|x64.Build.0 = Release|x64
+		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Release|x86.ActiveCfg = Release|Win32
+		{B31BFF9D-2D14-4B1A-A625-8348CC3D8D67}.Release|x86.Build.0 = Release|Win32
+		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Debug|Win32.Build.0 = Debug|Win32
 		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Debug|x64.ActiveCfg = Debug|x64
 		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Debug|x64.Build.0 = Debug|x64
+		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Debug|x86.ActiveCfg = Debug|Win32
+		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Debug|x86.Build.0 = Debug|Win32
+		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Release|Win32.ActiveCfg = Release|Win32
+		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Release|Win32.Build.0 = Release|Win32
 		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Release|x64.ActiveCfg = Release|x64
 		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Release|x64.Build.0 = Release|x64
+		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Release|x86.ActiveCfg = Release|Win32
+		{DF692F94-3A11-40E1-8846-9815B4DBBDB0}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Aerofoil/Aerofoil.vcxproj

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -20,13 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -45,6 +66,16 @@
     <Import Project="..\Debug.props" />
     <Import Project="..\AerofoilPortable.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\Common.props" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\GpMainApp.props" />
+    <Import Project="..\GpShell.props" />
+    <Import Project="..\Debug.props" />
+    <Import Project="..\AerofoilPortable.props" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\PortabilityLayer.props" />
@@ -55,6 +86,16 @@
     <Import Project="..\GpShell.props" />
     <Import Project="..\AerofoilPortable.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\Common.props" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\GpMainApp.props" />
+    <Import Project="..\Release.props" />
+    <Import Project="..\GpShell.props" />
+    <Import Project="..\AerofoilPortable.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -68,6 +109,17 @@
       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -83,6 +135,21 @@
       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\AerofoilPortable\GpAllocator_C.cpp" />
     <ClCompile Include="GpBWCursor_Win32.cpp" />

Aerofoil/GpFileSystem_Win32.cpp

@@ -206,7 +206,11 @@ bool GpFileSystem_Win32::Init()
 			break;
 		}
 		else
+		{
+			if (currentPathLength == 0)
+				break;
 			currentPathLength--;
+		}
 	}
 
 	if (currentPathLength == 0)

Aerofoil/resource.h

@@ -1,17 +1,17 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by GpD3D.rc
-//
-#define IDI_ICON1                       101
-#define IDI_ICON2                       102
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        103
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by GpD3D.rc
+//
+#define IDI_ICON1                       101
+#define IDI_ICON2                       102
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        103
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

AerofoilAndroid/GPSPrivacyPolicy.txt

@@ -1,5 +1,5 @@
-Aerofoil - Google Play Store Distribution - Privacy Policy
-------------------------------------------------------------------------------
-
-The Aerofoil app does not collect or transmit any personal information,
+Aerofoil - Google Play Store Distribution - Privacy Policy
+------------------------------------------------------------------------------
+
+The Aerofoil app does not collect or transmit any personal information,
 sensitive information, or any other form of user data.

AerofoilAndroid/HowToBuild.txt

@@ -0,0 +1,19 @@
+Create a folder in the Aerofoil root directory named "tools"
+Put 7-zip's "7z.exe" and "7z.dll" in the "tools" directory
+
+Build the Aerofoil.sln project in release mode in Visual Studio
+
+Open a command prompt with administrator privileges
+Change the directory to the AerofoilAndroid directory
+Run make_symlinks.bat
+
+First time, and any time data changes:
+Run ConvertResources.bat in the root directory
+Run copy_packaged_resources.bat in the AerofoilAndroid directory
+
+First time, and any time source changes:
+Run copy_source_package.bat in the AerofoilAndroid directory
+
+Install Android Studio
+Open the AerofoilAndroid directory as a project
+Downgrade the JDK to version 11 in the SDK settings

AerofoilAndroid/app/build.gradle

@@ -8,15 +8,15 @@ else {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
     defaultConfig {
         if (buildAsApplication) {
             applicationId "org.thecodedeposit.aerofoil"
         }
         minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 16
-        versionName "1.1.2"
+        targetSdkVersion 34
+        versionCode 20
+        versionName "1.1.6"
         externalNativeBuild {
             ndkBuild {
                 arguments "APP_PLATFORM=android-16"
@@ -33,6 +33,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
     if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {
@@ -65,9 +66,14 @@ android {
         }
     }
 
-	aaptOptions {
-		noCompress 'gpf'
-	}
+    aaptOptions {
+        noCompress 'gpf'
+    }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

AerofoilAndroid/app/jni/.gitignore

@@ -1,14 +1,14 @@
-AerofoilSDL
-AerofoilPortable
-Common
-FreeType
-GpApp
-GpCommon
-GpFontHandler_FreeType2
-GpShell
-MacRomanConversion
-PortabilityLayer
-rapidjson
-SDL2
-stb
-zlib
+AerofoilSDL
+AerofoilPortable
+Common
+FreeType
+GpApp
+GpCommon
+GpFontHandler_FreeType2
+GpShell
+MacRomanConversion
+PortabilityLayer
+rapidjson
+SDL2
+stb
+zlib

AerofoilAndroid/app/src/main/AndroidManifest.xml

@@ -75,11 +75,17 @@
             android:alwaysRetainTaskState="true"
             android:launchMode="singleInstance"
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
+            android:preferMinimalPostProcessing="true"
+            android:exported="true"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <!-- Let Android know that we can handle some USB devices and should receive this event -->
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+            </intent-filter>
             <!-- Drop file event -->
             <!--
             <intent-filter>

AerofoilAndroid/app/src/main/assets/.gitignore

@@ -1,3 +1,3 @@
-Packaged
-Resources
+Packaged
+Resources
 SourceCode.pkg

AerofoilAndroid/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java

@@ -186,7 +186,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
     // Because on Chromebooks we show up as a dual-mode device, it will attempt to connect TRANSPORT_AUTO, which will use TRANSPORT_BREDR instead
     // of TRANSPORT_LE.  Let's force ourselves to connect low energy.
     private BluetoothGatt connectGatt(boolean managed) {
-        if (Build.VERSION.SDK_INT >= 23) {
+        if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
             try {
                 return mDevice.connectGatt(mManager.getContext(), managed, this, TRANSPORT_LE);
             } catch (Exception e) {
@@ -429,7 +429,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
                     }
                 });
             }
-        } 
+        }
         else if (newState == 0) {
             mIsConnected = false;
         }
@@ -564,10 +564,10 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
         return "Steam Controller";
     }
 
-	@Override
+    @Override
     public UsbDevice getDevice() {
-		return null;
-	}
+        return null;
+    }
 
     @Override
     public boolean open() {

AerofoilAndroid/app/src/main/java/org/libsdl/app/HIDDeviceManager.java

@@ -7,6 +7,7 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothProfile;
+import android.os.Build;
 import android.util.Log;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -104,36 +105,6 @@ public class HIDDeviceManager {
     private HIDDeviceManager(final Context context) {
         mContext = context;
 
-        // Make sure we have the HIDAPI library loaded with the native functions
-        try {
-            SDL.loadLibrary("hidapi");
-        } catch (Throwable e) {
-            Log.w(TAG, "Couldn't load hidapi: " + e.toString());
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setCancelable(false);
-            builder.setTitle("SDL HIDAPI Error");
-            builder.setMessage("Please report the following error to the SDL maintainers: " + e.getMessage());
-            builder.setNegativeButton("Quit", new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    try {
-                        // If our context is an activity, exit rather than crashing when we can't
-                        // call our native functions.
-                        Activity activity = (Activity)context;
-        
-                        activity.finish();
-                    }
-                    catch (ClassCastException cce) {
-                        // Context wasn't an activity, there's nothing we can do.  Give up and return.
-                    }
-                }
-            });
-            builder.show();
-
-            return;
-        }
-        
         HIDDeviceRegisterCallback();
 
         mSharedPreferences = mContext.getSharedPreferences("hidapi", Context.MODE_PRIVATE);
@@ -148,9 +119,6 @@ public class HIDDeviceManager {
         {
             mNextDeviceId = mSharedPreferences.getInt("next_device_id", 0);
         }
-
-        initializeUSB();
-        initializeBluetooth();
     }
 
     public Context getContext() {
@@ -173,6 +141,9 @@ public class HIDDeviceManager {
 
     private void initializeUSB() {
         mUsbManager = (UsbManager)mContext.getSystemService(Context.USB_SERVICE);
+        if (mUsbManager == null) {
+            return;
+        }
 
         /*
         // Logging
@@ -199,7 +170,7 @@ public class HIDDeviceManager {
                 Log.i(TAG,"  Interface protocol: " + mUsbInterface.getInterfaceProtocol());
                 Log.i(TAG,"  Endpoint count: " + mUsbInterface.getEndpointCount());
 
-                // Get endpoint details 
+                // Get endpoint details
                 for (int epi = 0; epi < mUsbInterface.getEndpointCount(); epi++)
                 {
                     UsbEndpoint mEndpoint = mUsbInterface.getEndpoint(epi);
@@ -275,8 +246,13 @@ public class HIDDeviceManager {
             0x15e4, // Numark
             0x162e, // Joytech
             0x1689, // Razer Onza
+            0x1949, // Lab126, Inc.
             0x1bad, // Harmonix
+            0x20d6, // PowerA
             0x24c6, // PowerA
+            0x2c22, // Qanba
+            0x2dc8, // 8BitDo
+            0x9886, // ASTRO Gaming
         };
 
         if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
@@ -297,13 +273,20 @@ public class HIDDeviceManager {
         final int XB1_IFACE_SUBCLASS = 71;
         final int XB1_IFACE_PROTOCOL = 208;
         final int[] SUPPORTED_VENDORS = {
+            0x03f0, // HP
+            0x044f, // Thrustmaster
             0x045e, // Microsoft
             0x0738, // Mad Catz
+            0x0b05, // ASUS
             0x0e6f, // PDP
             0x0f0d, // Hori
+            0x10f5, // Turtle Beach
             0x1532, // Razer Wildcat
+            0x20d6, // PowerA
             0x24c6, // PowerA
+            0x2dc8, // 8BitDo
             0x2e24, // Hyperkin
+            0x3537, // GameSir
         };
 
         if (usbInterface.getId() == 0 &&
@@ -353,9 +336,18 @@ public class HIDDeviceManager {
 
     private void connectHIDDeviceUSB(UsbDevice usbDevice) {
         synchronized (this) {
+            int interface_mask = 0;
             for (int interface_index = 0; interface_index < usbDevice.getInterfaceCount(); interface_index++) {
                 UsbInterface usbInterface = usbDevice.getInterface(interface_index);
                 if (isHIDDeviceInterface(usbDevice, usbInterface)) {
+                    // Check to see if we've already added this interface
+                    // This happens with the Xbox Series X controller which has a duplicate interface 0, which is inactive
+                    int interface_id = usbInterface.getId();
+                    if ((interface_mask & (1 << interface_id)) != 0) {
+                        continue;
+                    }
+                    interface_mask |= (1 << interface_id);
+
                     HIDDeviceUSB device = new HIDDeviceUSB(this, usbDevice, interface_index);
                     int id = device.getId();
                     mDevicesById.put(id, device);
@@ -368,11 +360,23 @@ public class HIDDeviceManager {
     private void initializeBluetooth() {
         Log.d(TAG, "Initializing Bluetooth");
 
-        if (mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+        if (Build.VERSION.SDK_INT >= 31 /* Android 12  */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH_CONNECT, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH_CONNECT");
+            return;
+        }
+
+        if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
             Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH");
             return;
         }
 
+        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18 /* Android 4.3 (JELLY_BEAN_MR2) */)) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, this version of Android does not support Bluetooth LE");
+            return;
+        }
+
         // Find bonded bluetooth controllers and create SteamControllers for them
         mBluetoothManager = (BluetoothManager)mContext.getSystemService(Context.BLUETOOTH_SERVICE);
         if (mBluetoothManager == null) {
@@ -533,7 +537,7 @@ public class HIDDeviceManager {
             for (HIDDevice device : mDevicesById.values()) {
                 device.setFrozen(frozen);
             }
-        }        
+        }
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -555,6 +559,18 @@ public class HIDDeviceManager {
     ////////// JNI interface functions
     //////////////////////////////////////////////////////////////////////////////////////////////////////
 
+    public boolean initialize(boolean usb, boolean bluetooth) {
+        Log.v(TAG, "initialize(" + usb + ", " + bluetooth + ")");
+
+        if (usb) {
+            initializeUSB();
+        }
+        if (bluetooth) {
+            initializeBluetooth();
+        }
+        return true;
+    }
+
     public boolean openDevice(int deviceID) {
         Log.v(TAG, "openDevice deviceID=" + deviceID);
         HIDDevice device = getDevice(deviceID);
@@ -568,7 +584,20 @@ public class HIDDeviceManager {
         if (usbDevice != null && !mUsbManager.hasPermission(usbDevice)) {
             HIDDeviceOpenPending(deviceID);
             try {
-                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), 0));
+                final int FLAG_MUTABLE = 0x02000000; // PendingIntent.FLAG_MUTABLE, but don't require SDK 31
+                int flags;
+                if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
+                    flags = FLAG_MUTABLE;
+                } else {
+                    flags = 0;
+                }
+                if (Build.VERSION.SDK_INT >= 33 /* Android 14.0 (U) */) {
+                   Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
+                   intent.setPackage(mContext.getPackageName());
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
+               } else {
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
+               }
             } catch (Exception e) {
                 Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
                 HIDDeviceOpenResult(deviceID, false);

AerofoilAndroid/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

@@ -52,8 +52,13 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public String getSerialNumber() {
         String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
-            result = mDevice.getSerialNumber();
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
+            try {
+                result = mDevice.getSerialNumber();
+            }
+            catch (SecurityException exception) {
+                //Log.w(TAG, "App permissions mean we cannot get serial number for device " + getDeviceName() + " message: " + exception.getMessage());
+            }
         }
         if (result == null) {
             result = "";
@@ -69,7 +74,7 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public String getManufacturerName() {
         String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
             result = mDevice.getManufacturerName();
         }
         if (result == null) {
@@ -81,7 +86,7 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public String getProductName() {
         String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
             result = mDevice.getProductName();
         }
         if (result == null) {

AerofoilAndroid/app/src/main/java/org/libsdl/app/SDL.java

@@ -2,7 +2,8 @@ package org.libsdl.app;
 
 import android.content.Context;
 
-import java.lang.reflect.*;
+import java.lang.Class;
+import java.lang.reflect.Method;
 
 /**
     SDL library initialization
@@ -28,6 +29,7 @@ public class SDL {
 
     // This function stores the current activity (SDL or not)
     public static void setContext(Context context) {
+        SDLAudioManager.setContext(context);
         mContext = context;
     }
 
@@ -36,6 +38,10 @@ public class SDL {
     }
 
     public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+        loadLibrary(libraryName, mContext);
+    }
+
+    public static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
 
         if (libraryName == null) {
             throw new NullPointerException("No library name provided.");
@@ -51,20 +57,20 @@ public class SDL {
             // To use ReLinker, just add it as a dependency.  For more information, see 
             // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
             //
-            Class relinkClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
-            Class relinkListenerClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
-            Class contextClass = mContext.getClassLoader().loadClass("android.content.Context");
-            Class stringClass = mContext.getClassLoader().loadClass("java.lang.String");
+            Class<?> relinkClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
+            Class<?> relinkListenerClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
+            Class<?> contextClass = context.getClassLoader().loadClass("android.content.Context");
+            Class<?> stringClass = context.getClassLoader().loadClass("java.lang.String");
 
             // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if 
             // they've changed during updates.
             Method forceMethod = relinkClass.getDeclaredMethod("force");
             Object relinkInstance = forceMethod.invoke(null);
-            Class relinkInstanceClass = relinkInstance.getClass();
+            Class<?> relinkInstanceClass = relinkInstance.getClass();
 
             // Actually load the library!
             Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
-            loadMethod.invoke(relinkInstance, mContext, libraryName, null, null);
+            loadMethod.invoke(relinkInstance, context, libraryName, null, null);
         }
         catch (final Throwable e) {
             // Fall back
@@ -77,7 +83,7 @@ public class SDL {
             catch (final SecurityException se) {
                 throw se;
             }
-        }        
+        }
     }
 
     protected static Context mContext;

AerofoilAndroid/app/src/main/java/org/libsdl/app/SDLAudioManager.java

@@ -1,37 +1,77 @@
 package org.libsdl.app;
 
-import android.media.*;
+import android.content.Context;
+import android.media.AudioDeviceCallback;
+import android.media.AudioDeviceInfo;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioRecord;
+import android.media.AudioTrack;
+import android.media.MediaRecorder;
 import android.os.Build;
 import android.util.Log;
 
-public class SDLAudioManager
-{
+import java.util.Arrays;
+
+public class SDLAudioManager {
     protected static final String TAG = "SDLAudio";
 
     protected static AudioTrack mAudioTrack;
     protected static AudioRecord mAudioRecord;
+    protected static Context mContext;
+
+    private static final int[] NO_DEVICES = {};
+
+    private static AudioDeviceCallback mAudioDeviceCallback;
 
     public static void initialize() {
         mAudioTrack = null;
         mAudioRecord = null;
+        mAudioDeviceCallback = null;
+
+        if(Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */)
+        {
+            mAudioDeviceCallback = new AudioDeviceCallback() {
+                @Override
+                public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+                    Arrays.stream(addedDevices).forEach(deviceInfo -> addAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+
+                @Override
+                public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+                    Arrays.stream(removedDevices).forEach(deviceInfo -> removeAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+            };
+        }
+    }
+
+    public static void setContext(Context context) {
+        mContext = context;
+        if (context != null) {
+            registerAudioDeviceCallback();
+        }
+    }
+
+    public static void release(Context context) {
+        unregisterAudioDeviceCallback(context);
     }
 
     // Audio
 
     protected static String getAudioFormatString(int audioFormat) {
         switch (audioFormat) {
-        case AudioFormat.ENCODING_PCM_8BIT:
-            return "8-bit";
-        case AudioFormat.ENCODING_PCM_16BIT:
-            return "16-bit";
-        case AudioFormat.ENCODING_PCM_FLOAT:
-            return "float";
-        default:
-            return Integer.toString(audioFormat);
+            case AudioFormat.ENCODING_PCM_8BIT:
+                return "8-bit";
+            case AudioFormat.ENCODING_PCM_16BIT:
+                return "16-bit";
+            case AudioFormat.ENCODING_PCM_FLOAT:
+                return "float";
+            default:
+                return Integer.toString(audioFormat);
         }
     }
 
-    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
+    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
         int channelConfig;
         int sampleSize;
         int frameSize;
@@ -39,10 +79,14 @@ public class SDLAudioManager
         Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", requested " + desiredFrames + " frames of " + desiredChannels + " channel " + getAudioFormatString(audioFormat) + " audio at " + sampleRate + " Hz");
 
         /* On older devices let's use known good settings */
-        if (Build.VERSION.SDK_INT < 21) {
+        if (Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
             if (desiredChannels > 2) {
                 desiredChannels = 2;
             }
+        }
+
+        /* AudioTrack has sample rate limitation of 48000 (fixed in 5.0.2) */
+        if (Build.VERSION.SDK_INT < 22 /* Android 5.1 (LOLLIPOP_MR1) */) {
             if (sampleRate < 8000) {
                 sampleRate = 8000;
             } else if (sampleRate > 48000) {
@@ -51,7 +95,7 @@ public class SDLAudioManager
         }
 
         if (audioFormat == AudioFormat.ENCODING_PCM_FLOAT) {
-            int minSDKVersion = (isCapture ? 23 : 21);
+            int minSDKVersion = (isCapture ? 23 /* Android 6.0 (M) */ : 21 /* Android 5.0 (LOLLIPOP) */);
             if (Build.VERSION.SDK_INT < minSDKVersion) {
                 audioFormat = AudioFormat.ENCODING_PCM_16BIT;
             }
@@ -112,7 +156,7 @@ public class SDLAudioManager
                 channelConfig = AudioFormat.CHANNEL_OUT_5POINT1 | AudioFormat.CHANNEL_OUT_BACK_CENTER;
                 break;
             case 8:
-                if (Build.VERSION.SDK_INT >= 23) {
+                if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
                     channelConfig = AudioFormat.CHANNEL_OUT_7POINT1_SURROUND;
                 } else {
                     Log.v(TAG, "Requested " + desiredChannels + " channels, getting 5.1 surround");
@@ -193,13 +237,16 @@ public class SDLAudioManager
                     return null;
                 }
 
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioRecord.setPreferredDevice(getOutputAudioDeviceInfo(deviceId));
+                }
+
                 mAudioRecord.startRecording();
             }
 
             results[0] = mAudioRecord.getSampleRate();
             results[1] = mAudioRecord.getAudioFormat();
             results[2] = mAudioRecord.getChannelCount();
-            results[3] = desiredFrames;
 
         } else {
             if (mAudioTrack == null) {
@@ -217,25 +264,91 @@ public class SDLAudioManager
                     return null;
                 }
 
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioTrack.setPreferredDevice(getInputAudioDeviceInfo(deviceId));
+                }
+
                 mAudioTrack.play();
             }
 
             results[0] = mAudioTrack.getSampleRate();
             results[1] = mAudioTrack.getAudioFormat();
             results[2] = mAudioTrack.getChannelCount();
-            results[3] = desiredFrames;
         }
+        results[3] = desiredFrames;
 
         Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", got " + results[3] + " frames of " + results[2] + " channel " + getAudioFormatString(results[1]) + " audio at " + results[0] + " Hz");
 
         return results;
     }
 
+    private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static AudioDeviceInfo getOutputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static void registerAudioDeviceCallback() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null);
+        }
+    }
+
+    private static void unregisterAudioDeviceCallback(Context context) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback);
+        }
+    }
+
     /**
      * This method is called by SDL using JNI.
      */
-    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
-        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames);
+    public static int[] getAudioOutputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] getAudioInputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
     }
 
     /**
@@ -247,6 +360,11 @@ public class SDLAudioManager
             return;
         }
 
+        if (android.os.Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
+            Log.e(TAG, "Attempted to make an incompatible audio call with uninitialized audio! (floating-point output is supported since Android 5.0 Lollipop)");
+            return;
+        }
+
         for (int i = 0; i < buffer.length;) {
             int result = mAudioTrack.write(buffer, i, buffer.length - i, AudioTrack.WRITE_BLOCKING);
             if (result > 0) {
@@ -319,18 +437,22 @@ public class SDLAudioManager
     /**
      * This method is called by SDL using JNI.
      */
-    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
-        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames);
+    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
     }
 
     /** This method is called by SDL using JNI. */
     public static int captureReadFloatBuffer(float[] buffer, boolean blocking) {
-        return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return 0;
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
     }
 
     /** This method is called by SDL using JNI. */
     public static int captureReadShortBuffer(short[] buffer, boolean blocking) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
             return mAudioRecord.read(buffer, 0, buffer.length);
         } else {
             return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
@@ -339,7 +461,7 @@ public class SDLAudioManager
 
     /** This method is called by SDL using JNI. */
     public static int captureReadByteBuffer(byte[] buffer, boolean blocking) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
             return mAudioRecord.read(buffer, 0, buffer.length);
         } else {
             return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
@@ -384,4 +506,9 @@ public class SDLAudioManager
     }
 
     public static native int nativeSetupJNI();
+
+    public static native void removeAudioDevice(boolean isCapture, int deviceId);
+
+    public static native void addAudioDevice(boolean isCapture, int deviceId);
+
 }

AerofoilAndroid/app/src/main/java/org/libsdl/app/SDLControllerManager.java

@@ -6,9 +6,14 @@ import java.util.Comparator;
 import java.util.List;
 
 import android.content.Context;
-import android.os.*;
-import android.view.*;
+import android.os.Build;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
 
 
 public class SDLControllerManager
@@ -19,7 +24,7 @@ public class SDLControllerManager
     public static native int nativeAddJoystick(int device_id, String name, String desc,
                                                int vendor_id, int product_id,
                                                boolean is_accelerometer, int button_mask,
-                                               int naxes, int nhats, int nballs);
+                                               int naxes, int axis_mask, int nhats, int nballs);
     public static native int nativeRemoveJoystick(int device_id);
     public static native int nativeAddHaptic(int device_id, String name);
     public static native int nativeRemoveHaptic(int device_id);
@@ -37,7 +42,7 @@ public class SDLControllerManager
 
     public static void initialize() {
         if (mJoystickHandler == null) {
-            if (Build.VERSION.SDK_INT >= 19) {
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
                 mJoystickHandler = new SDLJoystickHandler_API19();
             } else {
                 mJoystickHandler = new SDLJoystickHandler_API16();
@@ -45,7 +50,7 @@ public class SDLControllerManager
         }
 
         if (mHapticHandler == null) {
-            if (Build.VERSION.SDK_INT >= 26) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
                 mHapticHandler = new SDLHapticHandler_API26();
             } else {
                 mHapticHandler = new SDLHapticHandler();
@@ -98,7 +103,7 @@ public class SDLControllerManager
         int sources = device.getSources();
 
         /* This is called for every button press, so let's not spam the logs */
-        /**
+        /*
         if ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
             Log.v(TAG, "Input device " + device.getName() + " has class joystick.");
         }
@@ -108,7 +113,7 @@ public class SDLControllerManager
         if ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) {
             Log.v(TAG, "Input device " + device.getName() + " is a gamepad.");
         }
-        **/
+        */
 
         return ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ||
                 ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) ||
@@ -163,11 +168,37 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
                 arg1Axis = MotionEvent.AXIS_GAS;
             }
 
+            // Make sure the AXIS_Z is sorted between AXIS_RY and AXIS_RZ.
+            // This is because the usual pairing are:
+            // - AXIS_X + AXIS_Y (left stick).
+            // - AXIS_RX, AXIS_RY (sometimes the right stick, sometimes triggers).
+            // - AXIS_Z, AXIS_RZ (sometimes the right stick, sometimes triggers).
+            // This sorts the axes in the above order, which tends to be correct
+            // for Xbox-ish game pads that have the right stick on RX/RY and the
+            // triggers on Z/RZ.
+            //
+            // Gamepads that don't have AXIS_Z/AXIS_RZ but use
+            // AXIS_LTRIGGER/AXIS_RTRIGGER are unaffected by this.
+            //
+            // References:
+            // - https://developer.android.com/develop/ui/views/touch-and-input/game-controllers/controller-input
+            // - https://www.kernel.org/doc/html/latest/input/gamepad.html
+            if (arg0Axis == MotionEvent.AXIS_Z) {
+                arg0Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg0Axis > MotionEvent.AXIS_Z && arg0Axis < MotionEvent.AXIS_RZ) {
+                --arg0Axis;
+            }
+            if (arg1Axis == MotionEvent.AXIS_Z) {
+                arg1Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg1Axis > MotionEvent.AXIS_Z && arg1Axis < MotionEvent.AXIS_RZ) {
+                --arg1Axis;
+            }
+
             return arg0Axis - arg1Axis;
         }
     }
 
-    private ArrayList<SDLJoystick> mJoysticks;
+    private final ArrayList<SDLJoystick> mJoysticks;
 
     public SDLJoystickHandler_API16() {
 
@@ -177,13 +208,14 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
     @Override
     public void pollInputDevices() {
         int[] deviceIds = InputDevice.getDeviceIds();
-        for(int i=0; i < deviceIds.length; ++i) {
-            SDLJoystick joystick = getJoystick(deviceIds[i]);
-            if (joystick == null) {
-                joystick = new SDLJoystick();
-                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
-                if (SDLControllerManager.isDeviceSDLJoystick(deviceIds[i])) {
-                    joystick.device_id = deviceIds[i];
+
+        for (int device_id : deviceIds) {
+            if (SDLControllerManager.isDeviceSDLJoystick(device_id)) {
+                SDLJoystick joystick = getJoystick(device_id);
+                if (joystick == null) {
+                    InputDevice joystickDevice = InputDevice.getDevice(device_id);
+                    joystick = new SDLJoystick();
+                    joystick.device_id = device_id;
                     joystick.name = joystickDevice.getName();
                     joystick.desc = getJoystickDescriptor(joystickDevice);
                     joystick.axes = new ArrayList<InputDevice.MotionRange>();
@@ -191,53 +223,57 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
 
                     List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
                     Collections.sort(ranges, new RangeComparator());
-                    for (InputDevice.MotionRange range : ranges ) {
+                    for (InputDevice.MotionRange range : ranges) {
                         if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
-                            if (range.getAxis() == MotionEvent.AXIS_HAT_X ||
-                                range.getAxis() == MotionEvent.AXIS_HAT_Y) {
+                            if (range.getAxis() == MotionEvent.AXIS_HAT_X || range.getAxis() == MotionEvent.AXIS_HAT_Y) {
                                 joystick.hats.add(range);
-                            }
-                            else {
+                            } else {
                                 joystick.axes.add(range);
                             }
                         }
                     }
 
                     mJoysticks.add(joystick);
-                    SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc, getVendorId(joystickDevice), getProductId(joystickDevice), false, getButtonMask(joystickDevice), joystick.axes.size(), joystick.hats.size()/2, 0);
+                    SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc,
+                            getVendorId(joystickDevice), getProductId(joystickDevice), false,
+                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, 0);
                 }
             }
         }
 
         /* Check removed devices */
-        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
-        for(int i=0; i < mJoysticks.size(); i++) {
-            int device_id = mJoysticks.get(i).device_id;
-            int j;
-            for (j=0; j < deviceIds.length; j++) {
-                if (device_id == deviceIds[j]) break;
+        ArrayList<Integer> removedDevices = null;
+        for (SDLJoystick joystick : mJoysticks) {
+            int device_id = joystick.device_id;
+            int i;
+            for (i = 0; i < deviceIds.length; i++) {
+                if (device_id == deviceIds[i]) break;
             }
-            if (j == deviceIds.length) {
-                removedDevices.add(Integer.valueOf(device_id));
+            if (i == deviceIds.length) {
+                if (removedDevices == null) {
+                    removedDevices = new ArrayList<Integer>();
+                }
+                removedDevices.add(device_id);
             }
         }
 
-        for(int i=0; i < removedDevices.size(); i++) {
-            int device_id = removedDevices.get(i).intValue();
-            SDLControllerManager.nativeRemoveJoystick(device_id);
-            for (int j=0; j < mJoysticks.size(); j++) {
-                if (mJoysticks.get(j).device_id == device_id) {
-                    mJoysticks.remove(j);
-                    break;
+        if (removedDevices != null) {
+            for (int device_id : removedDevices) {
+                SDLControllerManager.nativeRemoveJoystick(device_id);
+                for (int i = 0; i < mJoysticks.size(); i++) {
+                    if (mJoysticks.get(i).device_id == device_id) {
+                        mJoysticks.remove(i);
+                        break;
+                    }
                 }
             }
         }
     }
 
     protected SDLJoystick getJoystick(int device_id) {
-        for(int i=0; i < mJoysticks.size(); i++) {
-            if (mJoysticks.get(i).device_id == device_id) {
-                return mJoysticks.get(i);
+        for (SDLJoystick joystick : mJoysticks) {
+            if (joystick.device_id == device_id) {
+                return joystick;
             }
         }
         return null;
@@ -245,28 +281,22 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
 
     @Override
     public boolean handleMotionEvent(MotionEvent event) {
-        if ((event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
-            int actionPointerIndex = event.getActionIndex();
-            int action = event.getActionMasked();
-            switch(action) {
-                case MotionEvent.ACTION_MOVE:
-                    SDLJoystick joystick = getJoystick(event.getDeviceId());
-                    if ( joystick != null ) {
-                        for (int i = 0; i < joystick.axes.size(); i++) {
-                            InputDevice.MotionRange range = joystick.axes.get(i);
-                            /* Normalize the value to -1...1 */
-                            float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
-                            SDLControllerManager.onNativeJoy(joystick.device_id, i, value );
-                        }
-                        for (int i = 0; i < joystick.hats.size(); i+=2) {
-                            int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) );
-                            int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) );
-                            SDLControllerManager.onNativeHat(joystick.device_id, i/2, hatX, hatY );
-                        }
-                    }
-                    break;
-                default:
-                    break;
+        int actionPointerIndex = event.getActionIndex();
+        int action = event.getActionMasked();
+        if (action == MotionEvent.ACTION_MOVE) {
+            SDLJoystick joystick = getJoystick(event.getDeviceId());
+            if (joystick != null) {
+                for (int i = 0; i < joystick.axes.size(); i++) {
+                    InputDevice.MotionRange range = joystick.axes.get(i);
+                    /* Normalize the value to -1...1 */
+                    float value = (event.getAxisValue(range.getAxis(), actionPointerIndex) - range.getMin()) / range.getRange() * 2.0f - 1.0f;
+                    SDLControllerManager.onNativeJoy(joystick.device_id, i, value);
+                }
+                for (int i = 0; i < joystick.hats.size() / 2; i++) {
+                    int hatX = Math.round(event.getAxisValue(joystick.hats.get(2 * i).getAxis(), actionPointerIndex));
+                    int hatY = Math.round(event.getAxisValue(joystick.hats.get(2 * i + 1).getAxis(), actionPointerIndex));
+                    SDLControllerManager.onNativeHat(joystick.device_id, i, hatX, hatY);
+                }
             }
         }
         return true;
@@ -287,6 +317,9 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
     public int getVendorId(InputDevice joystickDevice) {
         return 0;
     }
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        return -1;
+    }
     public int getButtonMask(InputDevice joystickDevice) {
         return -1;
     }
@@ -304,6 +337,43 @@ class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
         return joystickDevice.getVendorId();
     }
 
+    @Override
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        // For compatibility, keep computing the axis mask like before,
+        // only really distinguishing 2, 4 and 6 axes.
+        int axis_mask = 0;
+        if (ranges.size() >= 2) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFTX) | (1 << SDL_GAMEPAD_AXIS_LEFTY))
+            axis_mask |= 0x0003;
+        }
+        if (ranges.size() >= 4) {
+            // ((1 << SDL_GAMEPAD_AXIS_RIGHTX) | (1 << SDL_GAMEPAD_AXIS_RIGHTY))
+            axis_mask |= 0x000c;
+        }
+        if (ranges.size() >= 6) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFT_TRIGGER) | (1 << SDL_GAMEPAD_AXIS_RIGHT_TRIGGER))
+            axis_mask |= 0x0030;
+        }
+        // Also add an indicator bit for whether the sorting order has changed.
+        // This serves to disable outdated gamecontrollerdb.txt mappings.
+        boolean have_z = false;
+        boolean have_past_z_before_rz = false;
+        for (InputDevice.MotionRange range : ranges) {
+            int axis = range.getAxis();
+            if (axis == MotionEvent.AXIS_Z) {
+                have_z = true;
+            } else if (axis > MotionEvent.AXIS_Z && axis < MotionEvent.AXIS_RZ) {
+                have_past_z_before_rz = true;
+            }
+        }
+        if (have_z && have_past_z_before_rz) {
+            // If both these exist, the compare() function changed sorting order.
+            // Set a bit to indicate this fact.
+            axis_mask |= 0x8000;
+        }
+        return axis_mask;
+    }
+
     @Override
     public int getButtonMask(InputDevice joystickDevice) {
         int button_mask = 0;
@@ -313,6 +383,7 @@ class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
             KeyEvent.KEYCODE_BUTTON_X,
             KeyEvent.KEYCODE_BUTTON_Y,
             KeyEvent.KEYCODE_BACK,
+            KeyEvent.KEYCODE_MENU,
             KeyEvent.KEYCODE_BUTTON_MODE,
             KeyEvent.KEYCODE_BUTTON_START,
             KeyEvent.KEYCODE_BUTTON_THUMBL,
@@ -354,6 +425,7 @@ class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
             (1 << 2),   // X -> X
             (1 << 3),   // Y -> Y
             (1 << 4),   // BACK -> BACK
+            (1 << 6),   // MENU -> START
             (1 << 5),   // MODE -> GUIDE
             (1 << 6),   // START -> START
             (1 << 7),   // THUMBL -> LEFTSTICK
@@ -432,13 +504,13 @@ class SDLHapticHandler_API26 extends SDLHapticHandler {
 
 class SDLHapticHandler {
 
-    class SDLHaptic {
+    static class SDLHaptic {
         public int device_id;
         public String name;
         public Vibrator vib;
     }
 
-    private ArrayList<SDLHaptic> mHaptics;
+    private final ArrayList<SDLHaptic> mHaptics;
 
     public SDLHapticHandler() {
         mHaptics = new ArrayList<SDLHaptic>();
@@ -474,13 +546,15 @@ class SDLHapticHandler {
             if (haptic == null) {
                 InputDevice device = InputDevice.getDevice(deviceIds[i]);
                 Vibrator vib = device.getVibrator();
-                if (vib.hasVibrator()) {
-                    haptic = new SDLHaptic();
-                    haptic.device_id = deviceIds[i];
-                    haptic.name = device.getName();
-                    haptic.vib = vib;
-                    mHaptics.add(haptic);
-                    SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                if (vib != null) {
+                    if (vib.hasVibrator()) {
+                        haptic = new SDLHaptic();
+                        haptic.device_id = deviceIds[i];
+                        haptic.name = device.getName();
+                        haptic.vib = vib;
+                        mHaptics.add(haptic);
+                        SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                    }
                 }
             }
         }
@@ -504,37 +578,41 @@ class SDLHapticHandler {
         }
 
         /* Check removed devices */
-        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
-        for(int i=0; i < mHaptics.size(); i++) {
-            int device_id = mHaptics.get(i).device_id;
-            int j;
-            for (j=0; j < deviceIds.length; j++) {
-                if (device_id == deviceIds[j]) break;
+        ArrayList<Integer> removedDevices = null;
+        for (SDLHaptic haptic : mHaptics) {
+            int device_id = haptic.device_id;
+            int i;
+            for (i = 0; i < deviceIds.length; i++) {
+                if (device_id == deviceIds[i]) break;
             }
 
-            if (device_id == deviceId_VIBRATOR_SERVICE && hasVibratorService) {
-                // don't remove the vibrator if it is still present
-            } else if (j == deviceIds.length) {
-                removedDevices.add(device_id);
-            }
+            if (device_id != deviceId_VIBRATOR_SERVICE || !hasVibratorService) {
+                if (i == deviceIds.length) {
+                    if (removedDevices == null) {
+                        removedDevices = new ArrayList<Integer>();
+                    }
+                    removedDevices.add(device_id);
+                }
+            }  // else: don't remove the vibrator if it is still present
         }
 
-        for(int i=0; i < removedDevices.size(); i++) {
-            int device_id = removedDevices.get(i);
-            SDLControllerManager.nativeRemoveHaptic(device_id);
-            for (int j=0; j < mHaptics.size(); j++) {
-                if (mHaptics.get(j).device_id == device_id) {
-                    mHaptics.remove(j);
-                    break;
+        if (removedDevices != null) {
+            for (int device_id : removedDevices) {
+                SDLControllerManager.nativeRemoveHaptic(device_id);
+                for (int i = 0; i < mHaptics.size(); i++) {
+                    if (mHaptics.get(i).device_id == device_id) {
+                        mHaptics.remove(i);
+                        break;
+                    }
                 }
             }
         }
     }
 
     protected SDLHaptic getHaptic(int device_id) {
-        for(int i=0; i < mHaptics.size(); i++) {
-            if (mHaptics.get(i).device_id == device_id) {
-                return mHaptics.get(i);
+        for (SDLHaptic haptic : mHaptics) {
+            if (haptic.device_id == device_id) {
+                return haptic;
             }
         }
         return null;
@@ -550,8 +628,6 @@ class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
 
         switch ( event.getSource() ) {
             case InputDevice.SOURCE_JOYSTICK:
-            case InputDevice.SOURCE_GAMEPAD:
-            case InputDevice.SOURCE_DPAD:
                 return SDLControllerManager.handleJoystickMotionEvent(event);
 
             case InputDevice.SOURCE_MOUSE:
@@ -655,8 +731,7 @@ class SDLGenericMotionListener_API24 extends SDLGenericMotionListener_API12 {
     public float getEventX(MotionEvent event) {
         if (mRelativeModeEnabled) {
             return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
-        }
-        else {
+        } else {
             return event.getX(0);
         }
     }
@@ -665,14 +740,12 @@ class SDLGenericMotionListener_API24 extends SDLGenericMotionListener_API12 {
     public float getEventY(MotionEvent event) {
         if (mRelativeModeEnabled) {
             return event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
-        }
-        else {
+        } else {
             return event.getY(0);
         }
     }
 }
 
-
 class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
     // Generic Motion (mouse hover, joystick...) events go here
     private boolean mRelativeModeEnabled;
@@ -684,8 +757,6 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
 
         switch ( event.getSource() ) {
             case InputDevice.SOURCE_JOYSTICK:
-            case InputDevice.SOURCE_GAMEPAD:
-            case InputDevice.SOURCE_DPAD:
                 return SDLControllerManager.handleJoystickMotionEvent(event);
 
             case InputDevice.SOURCE_MOUSE:
@@ -740,7 +811,7 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
 
     @Override
     public boolean supportsRelativeMouse() {
-        return (!SDLActivity.isDeXMode() || (Build.VERSION.SDK_INT >= 27));
+        return (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */);
     }
 
     @Override
@@ -750,18 +821,15 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
 
     @Override
     public boolean setRelativeMouseEnabled(boolean enabled) {
-        if (!SDLActivity.isDeXMode() || (Build.VERSION.SDK_INT >= 27)) {
+        if (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */) {
             if (enabled) {
                 SDLActivity.getContentView().requestPointerCapture();
-            }
-            else {
+            } else {
                 SDLActivity.getContentView().releasePointerCapture();
             }
             mRelativeModeEnabled = enabled;
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }

AerofoilAndroid/app/src/main/java/org/libsdl/app/SDLSurface.java

@@ -0,0 +1,405 @@
+package org.libsdl.app;
+
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.WindowManager;
+
+
+/**
+    SDLSurface. This is what we draw on, so we need to know when it's created
+    in order to do anything useful.
+
+    Because of this, that's where we set up the SDL thread
+*/
+public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
+
+    // Sensors
+    protected SensorManager mSensorManager;
+    protected Display mDisplay;
+
+    // Keep track of the surface size to normalize touch events
+    protected float mWidth, mHeight;
+
+    // Is SurfaceView ready for rendering
+    public boolean mIsSurfaceReady;
+
+    // Startup
+    public SDLSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this);
+
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+
+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+
+        setOnGenericMotionListener(SDLActivity.getMotionListener());
+
+        // Some arbitrary defaults to avoid a potential division by zero
+        mWidth = 1.0f;
+        mHeight = 1.0f;
+
+        mIsSurfaceReady = false;
+    }
+
+    public void handlePause() {
+        enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+    }
+
+    public void handleResume() {
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+    }
+
+    public Surface getNativeSurface() {
+        return getHolder().getSurface();
+    }
+
+    // Called when we have a valid drawing surface
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceCreated()");
+        SDLActivity.onNativeSurfaceCreated();
+    }
+
+    // Called when we lose the surface
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceDestroyed()");
+
+        // Transition to pause, if needed
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.PAUSED;
+        SDLActivity.handleNativeState();
+
+        mIsSurfaceReady = false;
+        SDLActivity.onNativeSurfaceDestroyed();
+    }
+
+    // Called when the surface is resized
+    @Override
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        Log.v("SDL", "surfaceChanged()");
+
+        if (SDLActivity.mSingleton == null) {
+            return;
+        }
+
+        mWidth = width;
+        mHeight = height;
+        int nDeviceWidth = width;
+        int nDeviceHeight = height;
+        try
+        {
+            if (Build.VERSION.SDK_INT >= 17 /* Android 4.2 (JELLY_BEAN_MR1) */) {
+                DisplayMetrics realMetrics = new DisplayMetrics();
+                mDisplay.getRealMetrics( realMetrics );
+                nDeviceWidth = realMetrics.widthPixels;
+                nDeviceHeight = realMetrics.heightPixels;
+            }
+        } catch(Exception ignored) {
+        }
+
+        synchronized(SDLActivity.getContext()) {
+            // In case we're waiting on a size change after going fullscreen, send a notification.
+            SDLActivity.getContext().notifyAll();
+        }
+
+        Log.v("SDL", "Window size: " + width + "x" + height);
+        Log.v("SDL", "Device size: " + nDeviceWidth + "x" + nDeviceHeight);
+        SDLActivity.nativeSetScreenResolution(width, height, nDeviceWidth, nDeviceHeight, mDisplay.getRefreshRate());
+        SDLActivity.onNativeResize();
+
+        // Prevent a screen distortion glitch,
+        // for instance when the device is in Landscape and a Portrait App is resumed.
+        boolean skip = false;
+        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+
+        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) {
+            if (mWidth > mHeight) {
+               skip = true;
+            }
+        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) {
+            if (mWidth < mHeight) {
+               skip = true;
+            }
+        }
+
+        // Special Patch for Square Resolution: Black Berry Passport
+        if (skip) {
+           double min = Math.min(mWidth, mHeight);
+           double max = Math.max(mWidth, mHeight);
+
+           if (max / min < 1.20) {
+              Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
+              skip = false;
+           }
+        }
+
+        // Don't skip in MultiWindow.
+        if (skip) {
+            if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+                if (SDLActivity.mSingleton.isInMultiWindowMode()) {
+                    Log.v("SDL", "Don't skip in Multi-Window");
+                    skip = false;
+                }
+            }
+        }
+
+        if (skip) {
+           Log.v("SDL", "Skip .. Surface is not ready.");
+           mIsSurfaceReady = false;
+           return;
+        }
+
+        /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
+        SDLActivity.onNativeSurfaceChanged();
+
+        /* Surface is ready */
+        mIsSurfaceReady = true;
+
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.RESUMED;
+        SDLActivity.handleNativeState();
+    }
+
+    // Key events
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        return SDLActivity.handleKeyEvent(v, keyCode, event, null);
+    }
+
+    // Touch events
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        /* Ref: http://developer.android.com/training/gestures/multi.html */
+        int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerFingerId;
+        int i = -1;
+        float x,y,p;
+
+        /*
+         * Prevent id to be -1, since it's used in SDL internal for synthetic events
+         * Appears when using Android emulator, eg:
+         *  adb shell input mouse tap 100 100
+         *  adb shell input touchscreen tap 100 100
+         */
+        if (touchDevId < 0) {
+            touchDevId -= 1;
+        }
+
+        // 12290 = Samsung DeX mode desktop mouse
+        // 12290 = 0x3002 = 0x2002 | 0x1002 = SOURCE_MOUSE | SOURCE_TOUCHSCREEN
+        // 0x2   = SOURCE_CLASS_POINTER
+        if (event.getSource() == InputDevice.SOURCE_MOUSE || event.getSource() == (InputDevice.SOURCE_MOUSE | InputDevice.SOURCE_TOUCHSCREEN)) {
+            int mouseButton = 1;
+            try {
+                Object object = event.getClass().getMethod("getButtonState").invoke(event);
+                if (object != null) {
+                    mouseButton = (Integer) object;
+                }
+            } catch(Exception ignored) {
+            }
+
+            // We need to check if we're in relative mouse mode and get the axis offset rather than the x/y values
+            // if we are.  We'll leverage our existing mouse motion listener
+            SDLGenericMotionListener_API12 motionListener = SDLActivity.getMotionListener();
+            x = motionListener.getEventX(event);
+            y = motionListener.getEventY(event);
+
+            SDLActivity.onNativeMouse(mouseButton, action, x, y, motionListener.inRelativeMode());
+        } else {
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_DOWN:
+                    // Primary pointer up/down, the index is always zero
+                    i = 0;
+                    /* fallthrough */
+                case MotionEvent.ACTION_POINTER_UP:
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    // Non primary pointer up/down
+                    if (i == -1) {
+                        i = event.getActionIndex();
+                    }
+
+                    pointerFingerId = event.getPointerId(i);
+                    x = event.getX(i) / mWidth;
+                    y = event.getY(i) / mHeight;
+                    p = event.getPressure(i);
+                    if (p > 1.0f) {
+                        // may be larger than 1.0f on some devices
+                        // see the documentation of getPressure(i)
+                        p = 1.0f;
+                    }
+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return true;
+   }
+
+    // Sensor events
+    public void enableSensor(int sensortype, boolean enabled) {
+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
+        if (enabled) {
+            mSensorManager.registerListener(this,
+                            mSensorManager.getDefaultSensor(sensortype),
+                            SensorManager.SENSOR_DELAY_GAME, null);
+        } else {
+            mSensorManager.unregisterListener(this,
+                            mSensorManager.getDefaultSensor(sensortype));
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+
+            // Since we may have an orientation set, we won't receive onConfigurationChanged events.
+            // We thus should check here.
+            int newOrientation;
+
+            float x, y;
+            switch (mDisplay.getRotation()) {
+                case Surface.ROTATION_90:
+                    x = -event.values[1];
+                    y = event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE;
+                    break;
+                case Surface.ROTATION_270:
+                    x = event.values[1];
+                    y = -event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE_FLIPPED;
+                    break;
+                case Surface.ROTATION_180:
+                    x = -event.values[0];
+                    y = -event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT_FLIPPED;
+                    break;
+                case Surface.ROTATION_0:
+                default:
+                    x = event.values[0];
+                    y = event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT;
+                    break;
+            }
+
+            if (newOrientation != SDLActivity.mCurrentOrientation) {
+                SDLActivity.mCurrentOrientation = newOrientation;
+                SDLActivity.onNativeOrientationChanged(newOrientation);
+            }
+
+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+                                      y / SensorManager.GRAVITY_EARTH,
+                                      event.values[2] / SensorManager.GRAVITY_EARTH);
+
+
+        }
+    }
+
+    // Captured pointer events for API 26.
+    public boolean onCapturedPointerEvent(MotionEvent event)
+    {
+        int action = event.getActionMasked();
+
+        float x, y;
+        switch (action) {
+            case MotionEvent.ACTION_SCROLL:
+                x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                SDLActivity.onNativeMouse(0, action, x, y, false);
+                return true;
+
+            case MotionEvent.ACTION_HOVER_MOVE:
+            case MotionEvent.ACTION_MOVE:
+                x = event.getX(0);
+                y = event.getY(0);
+                SDLActivity.onNativeMouse(0, action, x, y, true);
+                return true;
+
+            case MotionEvent.ACTION_BUTTON_PRESS:
+            case MotionEvent.ACTION_BUTTON_RELEASE:
+
+                // Change our action value to what SDL's code expects.
+                if (action == MotionEvent.ACTION_BUTTON_PRESS) {
+                    action = MotionEvent.ACTION_DOWN;
+                } else { /* MotionEvent.ACTION_BUTTON_RELEASE */
+                    action = MotionEvent.ACTION_UP;
+                }
+
+                x = event.getX(0);
+                y = event.getY(0);
+                int button = event.getButtonState();
+
+                SDLActivity.onNativeMouse(button, action, x, y, true);
+                return true;
+        }
+
+        return false;
+    }
+}

AerofoilAndroid/app/src/main/java/org/thecodedeposit/aerofoil/GpActivity.java

@@ -1,105 +1,100 @@
-package org.thecodedeposit.aerofoil;
-
-import org.libsdl.app.SDLActivity;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.AssetManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.ParcelFileDescriptor;
-import android.provider.MediaStore;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class GpActivity extends SDLActivity
-{
-    private static final int SOURCE_EXPORT_REQUEST_ID = 20;
-
-    private AssetManager assetManager;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-
-        assetManager = getAssets();
-    }
-
-    public String[] scanAssetDirectory(String directory)
-    {
-        try
-        {
-            return this.assetManager.list(directory);
-        }
-        catch (java.io.IOException ex)
-        {
-            return new String[0];
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent intent)
-    {
-        if (requestCode == SOURCE_EXPORT_REQUEST_ID)
-        {
-            if (resultCode == RESULT_OK)
-            {
-                Uri uri = intent.getData();
-                Context context = getContext();
-                ContentResolver contentResolver = context.getContentResolver();
-                try
-                {
-                    ParcelFileDescriptor fd = contentResolver.openFileDescriptor(uri, "w");
-                    GpFileSystemAPI.nativePostSourceExportRequest(false, fd.getFd(), fd);
-                }
-                catch (FileNotFoundException e)
-                {
-                    GpFileSystemAPI.nativePostSourceExportRequest(true, 0, null);
-                    return;
-                }
-                catch (IOException e)
-                {
-                    GpFileSystemAPI.nativePostSourceExportRequest(true, 0, null);
-                    return;
-                }
-                catch (Exception e)
-                {
-                    GpFileSystemAPI.nativePostSourceExportRequest(true, 0, null);
-                    return;
-                }
-            }
-            else
-                GpFileSystemAPI.nativePostSourceExportRequest(true, 0, null);
-        }
-        else
-        {
-            super.onActivityResult(requestCode, resultCode, intent);
-        }
-    }
-
-    public void selectSourceExportPath(String fname)
-    {
-        Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
-                .setType("application/zip")
-                .addCategory(Intent.CATEGORY_OPENABLE)
-                .putExtra(Intent.EXTRA_TITLE, fname);
-        startActivityForResult(intent, SOURCE_EXPORT_REQUEST_ID);
-    }
-
-    public void closeSourceExportPFD(Object obj)
-    {
-        try
-        {
-            ((ParcelFileDescriptor) obj).close();
-        }
-        catch (IOException e)
-        {
-        }
-    }
-}
+package org.thecodedeposit.aerofoil;
+
+import org.libsdl.app.SDLActivity;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.AssetManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.ParcelFileDescriptor;
+import android.provider.MediaStore;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class GpActivity extends SDLActivity
+{
+    private static final int SOURCE_EXPORT_REQUEST_ID = 20;
+
+    private AssetManager assetManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        assetManager = getAssets();
+    }
+
+    public String[] scanAssetDirectory(String directory)
+    {
+        try
+        {
+            return this.assetManager.list(directory);
+        }
+        catch (java.io.IOException ex)
+        {
+            return new String[0];
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent)
+    {
+        if (requestCode == SOURCE_EXPORT_REQUEST_ID)
+        {
+            if (resultCode == RESULT_OK)
+            {
+                Uri uri = intent.getData();
+                Context context = getContext();
+                ContentResolver contentResolver = context.getContentResolver();
+                try
+                {
+                    ParcelFileDescriptor fd = contentResolver.openFileDescriptor(uri, "w");
+                    GpFileSystemAPI.nativePostSourceExportRequest(false, fd.getFd(), fd);
+                }
+                catch (IOException e)
+                {
+                    GpFileSystemAPI.nativePostSourceExportRequest(true, 0, null);
+                    return;
+                }
+                catch (Exception e)
+                {
+                    GpFileSystemAPI.nativePostSourceExportRequest(true, 0, null);
+                    return;
+                }
+            }
+            else
+                GpFileSystemAPI.nativePostSourceExportRequest(true, 0, null);
+        }
+        else
+        {
+            super.onActivityResult(requestCode, resultCode, intent);
+        }
+    }
+
+    public void selectSourceExportPath(String fname)
+    {
+        Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
+                .setType("application/zip")
+                .addCategory(Intent.CATEGORY_OPENABLE)
+                .putExtra(Intent.EXTRA_TITLE, fname);
+        startActivityForResult(intent, SOURCE_EXPORT_REQUEST_ID);
+    }
+
+    public void closeSourceExportPFD(Object obj)
+    {
+        try
+        {
+            ((ParcelFileDescriptor) obj).close();
+        }
+        catch (IOException e)
+        {
+        }
+    }
+}

AerofoilAndroid/app/src/main/java/org/thecodedeposit/aerofoil/GpFileSystemAPI.java

@@ -1,6 +1,6 @@
-package org.thecodedeposit.aerofoil;
-
-public class GpFileSystemAPI
-{
-    public static native void nativePostSourceExportRequest(boolean cancelled, int fd, Object pfd);
-}
+package org.thecodedeposit.aerofoil;
+
+public class GpFileSystemAPI
+{
+    public static native void nativePostSourceExportRequest(boolean cancelled, int fd, Object pfd);
+}

AerofoilAndroid/app/src/main/java/org/thecodedeposit/aerofoil/GpSystemServices.java

@@ -1,5 +1,5 @@
-package org.thecodedeposit.aerofoil;
-
-public class GpSystemServices
-{
-}
+package org.thecodedeposit.aerofoil;
+
+public class GpSystemServices
+{
+}

AerofoilAndroid/copy_packaged_resources.bat

@@ -1,12 +1,12 @@
-cd app
-cd src
-cd main
-cd assets
-rmdir /S /Q Packaged
-mkdir Packaged
-cd Packaged
-rmdir /S /Q Houses
-mkdir Houses
-copy ..\..\..\..\..\..\Packaged\*.gpf .\
-copy ..\..\..\..\..\..\Packaged\Houses\* Houses\
-cd ..
+cd app
+cd src
+cd main
+cd assets
+rmdir /S /Q Packaged
+mkdir Packaged
+cd Packaged
+rmdir /S /Q Houses
+mkdir Houses
+copy ..\..\..\..\..\..\Packaged\*.gpf .\
+copy ..\..\..\..\..\..\Packaged\Houses\* Houses\
+cd ..

AerofoilAndroid/copy_source_package.bat

@@ -1,9 +1,9 @@
-cd ..
-copy /Y DefaultTimestamp.timestamp AerofoilAndroid\app\src\main\assets\Packaged\DefaultTimestamp.timestamp
-del AerofoilAndroid\app\src\main\assets\Packaged\SourceCode.zip
-del AerofoilAndroid\app\src\main\assets\Packaged\SourceCode.pkg
-git archive -0 --format zip -o AerofoilAndroid\app\src\main\assets\Packaged\SourceCode.zip HEAD
-tools\7z.exe d AerofoilAndroid\app\src\main\assets\Packaged\SourceCode.zip GliderProData\
-cd AerofoilAndroid\app\src\main\assets\Packaged
-rename SourceCode.zip SourceCode.pkg
-pause
+cd ..
+copy /Y DefaultTimestamp.timestamp AerofoilAndroid\app\src\main\assets\Packaged\DefaultTimestamp.timestamp
+del AerofoilAndroid\app\src\main\assets\Packaged\SourceCode.zip
+del AerofoilAndroid\app\src\main\assets\Packaged\SourceCode.pkg
+git archive -0 --format zip -o AerofoilAndroid\app\src\main\assets\Packaged\SourceCode.zip HEAD
+tools\7z.exe d AerofoilAndroid\app\src\main\assets\Packaged\SourceCode.zip GliderProData\
+cd AerofoilAndroid\app\src\main\assets\Packaged
+rename SourceCode.zip SourceCode.pkg
+pause

AerofoilAndroid/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sat Oct 17 02:06:49 EDT 2020
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

AerofoilAndroid/gradlew

@@ -1,74 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright <20> 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions <20>$var<61>, <20>${var}<7D>, <20>${var:-default}<7D>, <20>${var+SET}<7D>,
+#           <20>${var#prefix}<7D>, <20>${var%suffix}<7D>, and <20>$( cmd )<29>;
+#         * compound commands having a testable exit status, especially <20>case<73>;
+#         * various built-in commands including <20>command<6E>, <20>set<65>, and <20>ulimit<69>.
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -85,76 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

AerofoilAndroid/gradlew.bat

@@ -1,90 +1,89 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

AerofoilAndroid/make_symlinks.bat

@@ -1,19 +1,19 @@
-@setlocal enableextensions
-@cd /d "%~dp0"
-
-call remove_symlinks.bat
-
-
-mklink /D app\jni\AerofoilSDL ..\..\..\AerofoilSDL
-mklink /D app\jni\AerofoilPortable ..\..\..\AerofoilPortable
-mklink /D app\jni\Common ..\..\..\Common
-mklink /D app\jni\SDL2 ..\..\..\SDL2-2.0.12
-mklink /D app\jni\GpApp ..\..\..\GpApp
-mklink /D app\jni\GpShell ..\..\..\GpShell
-mklink /D app\jni\GpCommon ..\..\..\GpCommon
-mklink /D app\jni\PortabilityLayer ..\..\..\PortabilityLayer
-mklink /D app\jni\rapidjson ..\..\..\rapidjson
-mklink /D app\jni\MacRomanConversion ..\..\..\MacRomanConversion
-mklink /D app\jni\stb ..\..\..\stb
-
-pause
+@setlocal enableextensions
+@cd /d "%~dp0"
+
+call remove_symlinks.bat
+
+
+mklink /D app\jni\AerofoilSDL ..\..\..\AerofoilSDL
+mklink /D app\jni\AerofoilPortable ..\..\..\AerofoilPortable
+mklink /D app\jni\Common ..\..\..\Common
+mklink /D app\jni\SDL2 ..\..\..\SDL2-2.30.5
+mklink /D app\jni\GpApp ..\..\..\GpApp
+mklink /D app\jni\GpShell ..\..\..\GpShell
+mklink /D app\jni\GpCommon ..\..\..\GpCommon
+mklink /D app\jni\PortabilityLayer ..\..\..\PortabilityLayer
+mklink /D app\jni\rapidjson ..\..\..\rapidjson
+mklink /D app\jni\MacRomanConversion ..\..\..\MacRomanConversion
+mklink /D app\jni\stb ..\..\..\stb
+
+pause

AerofoilAndroid/remove_symlinks.bat

@@ -1,14 +1,14 @@
-@setlocal enableextensions
-@cd /d "%~dp0"
-
-rmdir app\jni\AerofoilSDL
-rmdir app\jni\AerofoilPortable
-rmdir app\jni\Common
-rmdir app\jni\SDL2
-rmdir app\jni\GpShell
-rmdir app\jni\GpCommon
-rmdir app\jni\GpApp
-rmdir app\jni\PortabilityLayer
-rmdir app\jni\rapidjson
-rmdir app\jni\MacRomanConversion
-rmdir app\jni\stb
+@setlocal enableextensions
+@cd /d "%~dp0"
+
+rmdir app\jni\AerofoilSDL
+rmdir app\jni\AerofoilPortable
+rmdir app\jni\Common
+rmdir app\jni\SDL2
+rmdir app\jni\GpShell
+rmdir app\jni\GpCommon
+rmdir app\jni\GpApp
+rmdir app\jni\PortabilityLayer
+rmdir app\jni\rapidjson
+rmdir app\jni\MacRomanConversion
+rmdir app\jni\stb

AerofoilPortable/Android.mk

@@ -1,22 +1,22 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := AerofoilPortable
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/../GpCommon	\
-	$(LOCAL_PATH)/../GpShell	\
-	$(LOCAL_PATH)/../Common	\
-	$(LOCAL_PATH)/../PortabilityLayer
-
-LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0
-
-# Add your application source files here...
-LOCAL_SRC_FILES := \
-	GpAllocator_C.cpp	\
-	GpThreadEvent_Cpp11.cpp	\
-	GpSystemServices_POSIX.cpp
-
-
-include $(BUILD_STATIC_LIBRARY)
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := AerofoilPortable
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/../GpCommon	\
+	$(LOCAL_PATH)/../GpShell	\
+	$(LOCAL_PATH)/../Common	\
+	$(LOCAL_PATH)/../PortabilityLayer
+
+LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0
+
+# Add your application source files here...
+LOCAL_SRC_FILES := \
+	GpAllocator_C.cpp	\
+	GpThreadEvent_Cpp11.cpp	\
+	GpSystemServices_POSIX.cpp
+
+
+include $(BUILD_STATIC_LIBRARY)

AerofoilPortable/GpAllocator_C.cpp

@@ -104,7 +104,7 @@ void GpAllocator_C::Free(void *buf)
 	const GpAllocator_C_MMBlock *mmBlock = reinterpret_cast<const GpAllocator_C_MMBlock*>(bytes - GpAllocator_C_MMBlock::AlignedSize());
 
 	void *freeLoc = bytes - GpAllocator_C_MMBlock::AlignedSize() - mmBlock->m_offsetFromAllocLocation;
-	(void)realloc(freeLoc, 0);
+	free(freeLoc);
 }
 
 GpAllocator_C *GpAllocator_C::GetInstance()

AerofoilPortable/GpSystemServices_POSIX.cpp

@@ -17,7 +17,7 @@ GpSystemServices_POSIX::GpSystemServices_POSIX()
 int64_t GpSystemServices_POSIX::GetTime() const
 {
 	time_t t = time(nullptr);
-	return static_cast<int64_t>(t) - 2082844800;
+	return static_cast<int64_t>(t) + 2082844800;
 }
 
 void GpSystemServices_POSIX::GetLocalDateTime(unsigned int &year, unsigned int &month, unsigned int &day, unsigned int &hour, unsigned int &minute, unsigned int &second) const

AerofoilSDL/AerofoilSDL.props

@@ -3,8 +3,8 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <IncludePath>$(SolutionDir)SDL2-2.0.12\include;$(SolutionDir)AerofoilPortable;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)SDL2-2.0.12\lib\x64;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)SDL2-2.30.5\include;$(SolutionDir)AerofoilPortable;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)SDL2-2.30.5\lib\x64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>

AerofoilSDL/AerofoilSDL.vcxproj

@@ -20,13 +20,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>

AerofoilSDL/AerofoilSDL_Combined.cpp

@@ -1,8 +1,8 @@
-#include "GpAudioDriver_SDL2.cpp"
-#include "GpDisplayDriver_SDL_GL2.cpp"
-#include "GpInputDriver_SDL_Gamepad.cpp"
-#include "ShaderCode/CopyQuadP.cpp"
-#include "ShaderCode/DrawQuadPaletteP.cpp"
-#include "ShaderCode/DrawQuad32P.cpp"
-#include "ShaderCode/DrawQuadV.cpp"
-#include "ShaderCode/ScaleQuadP.cpp"
+#include "GpAudioDriver_SDL2.cpp"
+#include "GpDisplayDriver_SDL_GL2.cpp"
+#include "GpInputDriver_SDL_Gamepad.cpp"
+#include "ShaderCode/CopyQuadP.cpp"
+#include "ShaderCode/DrawQuadPaletteP.cpp"
+#include "ShaderCode/DrawQuad32P.cpp"
+#include "ShaderCode/DrawQuadV.cpp"
+#include "ShaderCode/ScaleQuadP.cpp"

AerofoilSDL/Android.mk

@@ -1,30 +1,30 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := AerofoilSDL
-
-SDL_PATH := ../SDL2
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/../GpCommon	\
-	$(LOCAL_PATH)/../GpShell	\
-	$(LOCAL_PATH)/../Common	\
-	$(LOCAL_PATH)/../PortabilityLayer	\
-	$(LOCAL_PATH)/../AerofoilPortable	\
-	$(LOCAL_PATH)/$(SDL_PATH)/include
-
-LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0
-
-# Add your application source files here...
-LOCAL_SRC_FILES := \
-	GpAudioDriver_SDL2.cpp	\
-	GpDisplayDriver_SDL_GL2.cpp	\
-	GpInputDriver_SDL_Gamepad.cpp	\
-	ShaderCode/CopyQuadP.cpp	\
-	ShaderCode/DrawQuadPaletteP.cpp	\
-	ShaderCode/DrawQuad32P.cpp	\
-	ShaderCode/DrawQuadV.cpp	\
-	ShaderCode/ScaleQuadP.cpp
-
-include $(BUILD_STATIC_LIBRARY)
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := AerofoilSDL
+
+SDL_PATH := ../SDL2
+
+LOCAL_C_INCLUDES := \
+	$(LOCAL_PATH)/../GpCommon	\
+	$(LOCAL_PATH)/../GpShell	\
+	$(LOCAL_PATH)/../Common	\
+	$(LOCAL_PATH)/../PortabilityLayer	\
+	$(LOCAL_PATH)/../AerofoilPortable	\
+	$(LOCAL_PATH)/$(SDL_PATH)/include
+
+LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0
+
+# Add your application source files here...
+LOCAL_SRC_FILES := \
+	GpAudioDriver_SDL2.cpp	\
+	GpDisplayDriver_SDL_GL2.cpp	\
+	GpInputDriver_SDL_Gamepad.cpp	\
+	ShaderCode/CopyQuadP.cpp	\
+	ShaderCode/DrawQuadPaletteP.cpp	\
+	ShaderCode/DrawQuad32P.cpp	\
+	ShaderCode/DrawQuadV.cpp	\
+	ShaderCode/ScaleQuadP.cpp
+
+include $(BUILD_STATIC_LIBRARY)

AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp

@@ -1301,6 +1301,13 @@ bool GpDisplayDriver_SDL_GL2::Init()
 		windowFlags |= SDL_WINDOW_RESIZABLE;
 
 	m_window = SDL_CreateWindow(GP_APPLICATION_NAME, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, m_windowWidthPhysical, m_windowHeightPhysical, windowFlags);
+	if (!m_window)
+	{
+		if (logger)
+			logger->Printf(IGpLogDriver::Category_Error, "Failed to create window: %s", SDL_GetError());
+
+		return false;
+	}
 
 	if (m_isFullScreen)
 	{

AerofoilSDL/GpSDL.h

@@ -1,5 +1,5 @@
-#ifdef __CYGWIN__
-#define GP_SDL_DIRECTORY_PREFIX "SDL2/"
-#else
-#define GP_SDL_DIRECTORY_PREFIX
-#endif
+#ifdef __CYGWIN__
+#define GP_SDL_DIRECTORY_PREFIX "SDL2/"
+#else
+#define GP_SDL_DIRECTORY_PREFIX
+#endif

AerofoilSDL/ShaderCode/DrawQuadPixelConstants.h

@@ -1,5 +1,5 @@
-#define GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H "uniform vec4 constants_Modulation;\n"\
-"uniform vec2 constants_FlickerAxis;\n"\
-"uniform float constants_FlickerStartThreshold;\n"\
-"uniform float constants_FlickerEndThreshold;\n"\
-"uniform float constants_Desaturation;\n"
+#define GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H "uniform vec4 constants_Modulation;\n"\
+"uniform vec2 constants_FlickerAxis;\n"\
+"uniform float constants_FlickerStartThreshold;\n"\
+"uniform float constants_FlickerEndThreshold;\n"\
+"uniform float constants_Desaturation;\n"

AerofoilSDL/ShaderCode/Functions.h

@@ -1,9 +1,10 @@
-#ifdef __MACOS__
-	#define GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX ""
-	#define GP_GL_SHADER_CODE_HIGH_PRECISION_PREFIX	""
-#else
+#ifdef __ANDROID__
+	// This doesn't work on AMD Windows drivers
 	#define GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX "precision mediump float;\n"
 	#define GP_GL_SHADER_CODE_HIGH_PRECISION_PREFIX "precision highp float;\n"
+#else
+	#define GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX ""
+	#define GP_GL_SHADER_CODE_HIGH_PRECISION_PREFIX	""
 #endif
 
 #define GP_GL_SHADER_CODE_FUNCTIONS_H	"vec3 pow3(vec3 v, float ex)\n"\

AerofoilWeb/.gitignore

@@ -1,3 +1,3 @@
-obj
-res
-bin
+obj
+res
+bin

AerofoilWeb/AerofoilWeb_Combined.cpp

@@ -1,4 +1,4 @@
-#include "GpFileSystem_Web.cpp"
-#include "GpLogDriver_Web.cpp"
-#include "GpMain_SDL_Web.cpp"
-#include "GpSystemServices_Web.cpp"
+#include "GpFileSystem_Web.cpp"
+#include "GpLogDriver_Web.cpp"
+#include "GpMain_SDL_Web.cpp"
+#include "GpSystemServices_Web.cpp"

AerofoilWeb/AerofoilWeb_Resources.cpp

@@ -1,15 +1,15 @@
-#include <stdint.h>
-
-#include "GpFileSystem_Web_Resources.h"
-
-namespace GpFileSystem_Web_Resources
-{
-	namespace ApplicationData
-	{
-		#include "res/ApplicationData.h"
-	}
-	namespace GameData
-	{
-		#include "res/GameData.h"
-	}
-}
+#include <stdint.h>
+
+#include "GpFileSystem_Web_Resources.h"
+
+namespace GpFileSystem_Web_Resources
+{
+	namespace ApplicationData
+	{
+		#include "res/ApplicationData.h"
+	}
+	namespace GameData
+	{
+		#include "res/GameData.h"
+	}
+}

AerofoilWeb/BuildAerofoilPortable.bat

@@ -1,11 +1,11 @@
-set INPUT_DIR=../AerofoilPortable
-set OUTPUT_DIR=obj
-
-rem set DEBUG_LEVEL_FLAGS=-g4 -O0
-set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
-
-set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../Common/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
-
-emcc -c %INPUT_DIR%/GpAllocator_C.cpp -o %OUTPUT_DIR%/AerofoilPortable_Combined.o %FLAGS%
-
-pause
+set INPUT_DIR=../AerofoilPortable
+set OUTPUT_DIR=obj
+
+rem set DEBUG_LEVEL_FLAGS=-g4 -O0
+set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
+
+set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../Common/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
+
+emcc -c %INPUT_DIR%/GpAllocator_C.cpp -o %OUTPUT_DIR%/AerofoilPortable_Combined.o %FLAGS%
+
+pause

AerofoilWeb/BuildAerofoilSDL.bat

@@ -1,11 +1,11 @@
-set INPUT_DIR=../AerofoilSDL
-set OUTPUT_DIR=obj
-
-rem set DEBUG_LEVEL_FLAGS=-g4 -O0
-set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
-
-set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
-
-emcc -c %INPUT_DIR%/AerofoilSDL_Combined.cpp -o %OUTPUT_DIR%/AerofoilSDL_Combined.o %FLAGS%
-
-pause
+set INPUT_DIR=../AerofoilSDL
+set OUTPUT_DIR=obj
+
+rem set DEBUG_LEVEL_FLAGS=-g4 -O0
+set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
+
+set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
+
+emcc -c %INPUT_DIR%/AerofoilSDL_Combined.cpp -o %OUTPUT_DIR%/AerofoilSDL_Combined.o %FLAGS%
+
+pause

AerofoilWeb/BuildAerofoilWeb.bat

@@ -1,11 +1,11 @@
-set INPUT_DIR=.
-set OUTPUT_DIR=obj
-
-rem set DEBUG_LEVEL_FLAGS=-g4 -O0
-set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
-
-set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -I../AerofoilPortable/ -I../GpShell/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
-
-emcc -c %INPUT_DIR%/AerofoilWeb_Combined.cpp -o %OUTPUT_DIR%/AerofoilWeb_Combined.o %FLAGS%
-
-pause
+set INPUT_DIR=.
+set OUTPUT_DIR=obj
+
+rem set DEBUG_LEVEL_FLAGS=-g4 -O0
+set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
+
+set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -I../AerofoilPortable/ -I../GpShell/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
+
+emcc -c %INPUT_DIR%/AerofoilWeb_Combined.cpp -o %OUTPUT_DIR%/AerofoilWeb_Combined.o %FLAGS%
+
+pause

AerofoilWeb/BuildGpApp.bat

@@ -1,11 +1,11 @@
-set INPUT_DIR=../GpApp
-set OUTPUT_DIR=obj
-
-rem set DEBUG_LEVEL_FLAGS=-g4 -O0
-set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
-
-set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
-
-emcc -c %INPUT_DIR%/GpApp_Combined.cpp -o %OUTPUT_DIR%/GpApp_Combined.o %FLAGS%
-
-pause
+set INPUT_DIR=../GpApp
+set OUTPUT_DIR=obj
+
+rem set DEBUG_LEVEL_FLAGS=-g4 -O0
+set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
+
+set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
+
+emcc -c %INPUT_DIR%/GpApp_Combined.cpp -o %OUTPUT_DIR%/GpApp_Combined.o %FLAGS%
+
+pause

AerofoilWeb/BuildGpShell.bat

@@ -1,11 +1,11 @@
-set INPUT_DIR=../GpShell
-set OUTPUT_DIR=obj
-
-rem set DEBUG_LEVEL_FLAGS=-g4 -O0
-set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
-
-set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
-
-emcc -c %INPUT_DIR%/GpShell_Combined.cpp -o %OUTPUT_DIR%/GpShell_Combined.o %FLAGS%
-
-pause
+set INPUT_DIR=../GpShell
+set OUTPUT_DIR=obj
+
+rem set DEBUG_LEVEL_FLAGS=-g4 -O0
+set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
+
+set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0
+
+emcc -c %INPUT_DIR%/GpShell_Combined.cpp -o %OUTPUT_DIR%/GpShell_Combined.o %FLAGS%
+
+pause

AerofoilWeb/BuildMacRomanConversion.bat

@@ -1,11 +1,11 @@
-set INPUT_DIR=../MacRomanConversion
-set OUTPUT_DIR=obj
-
-rem set DEBUG_LEVEL_FLAGS=-g4 -O0
-set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
-
-set FLAGS=-flto -I../MacRomanConversion/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS%
-
-emcc -c %INPUT_DIR%/MacRomanConversion.cpp -o %OUTPUT_DIR%/MacRomanConversion.o %FLAGS%
-
-pause
+set INPUT_DIR=../MacRomanConversion
+set OUTPUT_DIR=obj
+
+rem set DEBUG_LEVEL_FLAGS=-g4 -O0
+set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
+
+set FLAGS=-flto -I../MacRomanConversion/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS%
+
+emcc -c %INPUT_DIR%/MacRomanConversion.cpp -o %OUTPUT_DIR%/MacRomanConversion.o %FLAGS%
+
+pause

AerofoilWeb/BuildPortabilityLayer.bat

@@ -1,11 +1,11 @@
-set INPUT_DIR=../PortabilityLayer
-set OUTPUT_DIR=obj
-
-rem set DEBUG_LEVEL_FLAGS=-g4 -O0
-set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
-
-set FLAGS=-s USE_ZLIB=1 -flto -I../GpCommon/ -I../Common/ -I../PortabilityLayer/ -I../rapidjson/include/ -I../MacRomanConversion/ -I../stb/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0 -Wno-tautological-constant-out-of-range-compare
-
-emcc -c %INPUT_DIR%/PortabilityLayer_Combined.cpp -o %OUTPUT_DIR%/PortabilityLayer_Combined.o %FLAGS%
-
-pause
+set INPUT_DIR=../PortabilityLayer
+set OUTPUT_DIR=obj
+
+rem set DEBUG_LEVEL_FLAGS=-g4 -O0
+set DEBUG_LEVEL_FLAGS=-O3 -DNDEBUG=1
+
+set FLAGS=-s USE_ZLIB=1 -flto -I../GpCommon/ -I../Common/ -I../PortabilityLayer/ -I../rapidjson/include/ -I../MacRomanConversion/ -I../stb/ -s ASYNCIFY %DEBUG_LEVEL_FLAGS% -DGP_DEBUG_CONFIG=0 -Wno-tautological-constant-out-of-range-compare
+
+emcc -c %INPUT_DIR%/PortabilityLayer_Combined.cpp -o %OUTPUT_DIR%/PortabilityLayer_Combined.o %FLAGS%
+
+pause

AerofoilWeb/BuildResources.bat

@@ -1,10 +1,10 @@
-..\x64\Release\bin2h.exe ..\Packaged res\ApplicationData.h
-..\x64\Release\bin2h.exe ..\Packaged\Houses res\GameData.h
-
-set INPUT_DIR=.
-set OUTPUT_DIR=obj
-set FLAGS=-flto -O3 -DGP_DEBUG_CONFIG=0
-
-emcc -c %INPUT_DIR%/AerofoilWeb_Resources.cpp -o %OUTPUT_DIR%/AerofoilWeb_Resources.o %FLAGS%
-
-pause
+..\x64\Release\bin2h.exe ..\Packaged res\ApplicationData.h
+..\x64\Release\bin2h.exe ..\Packaged\Houses res\GameData.h
+
+set INPUT_DIR=.
+set OUTPUT_DIR=obj
+set FLAGS=-flto -O3 -DGP_DEBUG_CONFIG=0
+
+emcc -c %INPUT_DIR%/AerofoilWeb_Resources.cpp -o %OUTPUT_DIR%/AerofoilWeb_Resources.o %FLAGS%
+
+pause

AerofoilWeb/GpFileSystem_Web.h

@@ -1,68 +1,68 @@
-#pragma once
-
-#include "IGpFileSystem.h"
-#include "GpFileSystem_Web_Resources.h"
-
-#include "GpCoreDefs.h"
-
-#include <string>
-#include <stdio.h>
-
-struct IGpMutex;
-
-class GpFileSystem_Web final : public IGpFileSystem
-{
-public:
-	GpFileSystem_Web();
-	~GpFileSystem_Web();
-	
-	void Init();
-
-	bool FileExists(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path) override;
-	bool FileLocked(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &exists) override;
-	GpIOStream *OpenFileNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* subPaths, size_t numSubPaths, bool writeAccess, GpFileCreationDisposition_t createDisposition) override;
-	bool DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed) GP_ASYNCIFY_PARANOID_OVERRIDE;
-	IGpDirectoryCursor *ScanDirectoryNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths) override;
-
-	bool ValidateFilePath(const char *path, size_t pathLen) const override;
-	bool ValidateFilePathUnicodeChar(uint32_t ch) const override;
-
-	void SetDelayCallback(DelayCallback_t delayCallback) override;
-
-	static void MarkFSStateDirty();
-	static void SyncDownloadFile(const std::string &filePath, const std::string &prettyName);
-	static void FlushFS();
-
-	static GpFileSystem_Web *GetInstance();
-
-private:
-	struct ScanDirectoryNestedContext
-	{
-		GpFileSystem_Web *m_this;
-
-		IGpDirectoryCursor *m_returnValue;
-		PortabilityLayer::VirtualDirectory_t m_virtualDirectory;
-		char const *const *m_paths;
-		size_t m_numPaths;
-	};
-
-	static void ScanDirectoryNestedThunk(void *context);
-	IGpDirectoryCursor *ScanDirectoryNestedInternal(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths);
-
-	IGpDirectoryCursor *ScanDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths);
-	
-	static const GpFileSystem_Web_Resources::FileCatalog *GetCatalogForVirtualDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory);
-
-	static IGpDirectoryCursor *ScanCatalog(const GpFileSystem_Web_Resources::FileCatalog &catalog);
-
-	bool ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, bool trailingSlash, std::string &resolution, bool &outIsIDB);
-
-	DelayCallback_t m_delayCallback;
-
-	std::string m_prefsPath;
-	std::string m_basePath;
-	std::string m_exportPath;
-	static bool ms_fsStateDirty;
-
-	static GpFileSystem_Web ms_instance;
-};
+#pragma once
+
+#include "IGpFileSystem.h"
+#include "GpFileSystem_Web_Resources.h"
+
+#include "GpCoreDefs.h"
+
+#include <string>
+#include <stdio.h>
+
+struct IGpMutex;
+
+class GpFileSystem_Web final : public IGpFileSystem
+{
+public:
+	GpFileSystem_Web();
+	~GpFileSystem_Web();
+	
+	void Init();
+
+	bool FileExists(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path) override;
+	bool FileLocked(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &exists) override;
+	GpIOStream *OpenFileNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* subPaths, size_t numSubPaths, bool writeAccess, GpFileCreationDisposition_t createDisposition) override;
+	bool DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed) GP_ASYNCIFY_PARANOID_OVERRIDE;
+	IGpDirectoryCursor *ScanDirectoryNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths) override;
+
+	bool ValidateFilePath(const char *path, size_t pathLen) const override;
+	bool ValidateFilePathUnicodeChar(uint32_t ch) const override;
+
+	void SetDelayCallback(DelayCallback_t delayCallback) override;
+
+	static void MarkFSStateDirty();
+	static void SyncDownloadFile(const std::string &filePath, const std::string &prettyName);
+	static void FlushFS();
+
+	static GpFileSystem_Web *GetInstance();
+
+private:
+	struct ScanDirectoryNestedContext
+	{
+		GpFileSystem_Web *m_this;
+
+		IGpDirectoryCursor *m_returnValue;
+		PortabilityLayer::VirtualDirectory_t m_virtualDirectory;
+		char const *const *m_paths;
+		size_t m_numPaths;
+	};
+
+	static void ScanDirectoryNestedThunk(void *context);
+	IGpDirectoryCursor *ScanDirectoryNestedInternal(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths);
+
+	IGpDirectoryCursor *ScanDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths);
+	
+	static const GpFileSystem_Web_Resources::FileCatalog *GetCatalogForVirtualDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory);
+
+	static IGpDirectoryCursor *ScanCatalog(const GpFileSystem_Web_Resources::FileCatalog &catalog);
+
+	bool ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, bool trailingSlash, std::string &resolution, bool &outIsIDB);
+
+	DelayCallback_t m_delayCallback;
+
+	std::string m_prefsPath;
+	std::string m_basePath;
+	std::string m_exportPath;
+	static bool ms_fsStateDirty;
+
+	static GpFileSystem_Web ms_instance;
+};

AerofoilWeb/GpSystemServices_Web.cpp

@@ -91,7 +91,7 @@ GpSystemServices_Web::GpSystemServices_Web()
 int64_t GpSystemServices_Web::GetTime() const
 {
 	time_t t = time(nullptr);
-	return static_cast<int64_t>(t) - 2082844800;
+	return static_cast<int64_t>(t) + 2082844800;
 }
 
 void GpSystemServices_Web::GetLocalDateTime(unsigned int &year, unsigned int &month, unsigned int &day, unsigned int &hour, unsigned int &minute, unsigned int &second) const

AerofoilWeb/Link.bat

@@ -1,10 +1,10 @@
-set INPUT_DIR=.
-set OUTPUT_DIR=bin
-
-rem set DEBUG_LEVEL_FLAGS=-g4 -O0
-set DEBUG_LEVEL_FLAGS=-O3
-
-copy /Y FileSaverDotJS\dist\FileSaver.js bin\FileSaver.js
-
-set FLAGS=-flto %DEBUG_LEVEL_FLAGS% -s USE_SDL=2 -s USE_ZLIB=1 -s ASYNCIFY -s ASYNCIFY_IGNORE_INDIRECT -s INITIAL_MEMORY=33554432 -s ASYNCIFY_ADVISE -lidbfs.js -s ASYNCIFY_IMPORTS=['InitFileSystem','FlushFileSystem'] --shell-file shell_minimal.html
-emcc obj/AerofoilWeb_Combined.o obj/AerofoilWeb_Resources.o obj/GpShell_Combined.o obj/AerofoilSDL_Combined.o obj/AerofoilPortable_Combined.o obj/GpApp_Combined.o obj/PortabilityLayer_Combined.o obj/MacRomanConversion.o -o %OUTPUT_DIR%/aerofoil.html %FLAGS%
+set INPUT_DIR=.
+set OUTPUT_DIR=bin
+
+rem set DEBUG_LEVEL_FLAGS=-g4 -O0
+set DEBUG_LEVEL_FLAGS=-O3
+
+copy /Y FileSaverDotJS\dist\FileSaver.js bin\FileSaver.js
+
+set FLAGS=-flto %DEBUG_LEVEL_FLAGS% -s USE_SDL=2 -s USE_ZLIB=1 -s ASYNCIFY -s ASYNCIFY_IGNORE_INDIRECT -s INITIAL_MEMORY=33554432 -s ASYNCIFY_ADVISE -lidbfs.js -s ASYNCIFY_IMPORTS=['InitFileSystem','FlushFileSystem'] --shell-file shell_minimal.html
+emcc obj/AerofoilWeb_Combined.o obj/AerofoilWeb_Resources.o obj/GpShell_Combined.o obj/AerofoilSDL_Combined.o obj/AerofoilPortable_Combined.o obj/GpApp_Combined.o obj/PortabilityLayer_Combined.o obj/MacRomanConversion.o -o %OUTPUT_DIR%/aerofoil.html %FLAGS%

AerofoilWeb/MakeBuildDirs.bat

@@ -1,3 +1,3 @@
-mkdir obj
-mkdir bin
-mkdir res
+mkdir obj
+mkdir bin
+mkdir res

AerofoilWeb/Rebuild.bat

@@ -1,9 +1,9 @@
-call MakeBuildDirs.bat
-call BuildAerofoilSDL.bat
-call BuildAerofoilWeb.bat
-call BuildGpApp.bat
-call BuildGpShell.bat
-call BuildMacRomanConversion.bat
-call BuildPortabilityLayer.bat
-call BuildResources.bat
-call Link.bat
+call MakeBuildDirs.bat
+call BuildAerofoilSDL.bat
+call BuildAerofoilWeb.bat
+call BuildGpApp.bat
+call BuildGpShell.bat
+call BuildMacRomanConversion.bat
+call BuildPortabilityLayer.bat
+call BuildResources.bat
+call Link.bat

AerofoilWeb/Run.bat

@@ -1 +1 @@
-emrun bin/aerofoil.html
+emrun bin/aerofoil.html

AerofoilX/GpFileSystem_X.cpp

@@ -1,494 +1,496 @@
-#define _LARGEFILE64_SOURCE
-#include "GpFileSystem_X.h"
-#include "GpIOStream.h"
-#include "IGpDirectoryCursor.h"
-#include "IGpSystemServices.h"
-#include "IGpMutex.h"
-#include "IGpThreadRelay.h"
-#include "VirtualDirectory.h"
-
-#include "PLDrivers.h"
-
-#ifdef __MACOS__
-#include <SDL.h>
-#include <SDL_rwops.h>
-#else
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_rwops.h"
-#endif
-
-#include <string>
-#include <vector>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <dirent.h>
-
-#include "UTF8.h"
-
-#if defined(__CYGWIN__) || defined(__MACOS__)
-typedef off_t off64_t;
-#define fstat64 fstat
-#define fseek64 fseek
-#define ftruncate64 ftruncate
-#define stat64 stat
-#endif
-
-class GpFileStream_X_File final : public GpIOStream
-{
-public:
-	GpFileStream_X_File(FILE *f, bool readOnly, bool writeOnly);
-	~GpFileStream_X_File();
-
-	size_t Read(void *bytesOut, size_t size) override;
-	size_t Write(const void *bytes, size_t size) override;
-	bool IsSeekable() const override;
-	bool IsReadOnly() const override;
-	bool IsWriteOnly() const override;
-	bool SeekStart(GpUFilePos_t loc) override;
-	bool SeekCurrent(GpFilePos_t loc) override;
-	bool SeekEnd(GpUFilePos_t loc) override;
-	GpUFilePos_t Size() const override;
-	GpUFilePos_t Tell() const override;
-	void Close() override;
-	void Flush() override;
-
-private:
-	FILE *m_f;
-	bool m_seekable;
-	bool m_isReadOnly;
-	bool m_isWriteOnly;
-};
-
-
-GpFileStream_X_File::GpFileStream_X_File(FILE *f, bool readOnly, bool writeOnly)
-	: m_f(f)
-	, m_isReadOnly(readOnly)
-	, m_isWriteOnly(writeOnly)
-{
-	m_seekable = (fseek(m_f, 0, SEEK_CUR) == 0);
-}
-
-GpFileStream_X_File::~GpFileStream_X_File()
-{
-	fclose(m_f);
-}
-
-size_t GpFileStream_X_File::Read(void *bytesOut, size_t size)
-{
-	if (m_isWriteOnly)
-		return 0;
-	return fread(bytesOut, 1, size, m_f);
-}
-
-size_t GpFileStream_X_File::Write(const void *bytes, size_t size)
-{
-	if (m_isReadOnly)
-		return 0;
-	return fwrite(bytes, 1, size, m_f);
-}
-
-bool GpFileStream_X_File::IsSeekable() const
-{
-	return m_seekable;
-}
-
-bool GpFileStream_X_File::IsReadOnly() const
-{
-	return m_isReadOnly;
-}
-
-bool GpFileStream_X_File::IsWriteOnly() const
-{
-	return m_isWriteOnly;
-}
-
-bool GpFileStream_X_File::SeekStart(GpUFilePos_t loc)
-{
-	if (!m_seekable)
-		return false;
-
-	fflush(m_f);
-	return fseek64(m_f, static_cast<off64_t>(loc), SEEK_SET) >= 0;
-}
-
-bool GpFileStream_X_File::SeekCurrent(GpFilePos_t loc)
-{
-	if (!m_seekable)
-		return false;
-
-	fflush(m_f);
-	return fseek64(m_f, static_cast<off64_t>(loc), SEEK_CUR) >= 0;
-}
-
-bool GpFileStream_X_File::SeekEnd(GpUFilePos_t loc)
-{
-	if (!m_seekable)
-		return false;
-
-	fflush(m_f);
-	return fseek64(m_f, -static_cast<off64_t>(loc), SEEK_END) >= 0;
-}
-
-GpUFilePos_t GpFileStream_X_File::Size() const
-{
-	fflush(m_f);
-
-	struct stat64 s;
-	if (fstat64(fileno(m_f), &s) < 0)
-		return 0;
-
-	return static_cast<GpUFilePos_t>(s.st_size);
-}
-
-GpUFilePos_t GpFileStream_X_File::Tell() const
-{
-	return static_cast<GpUFilePos_t>(ftell(m_f));
-}
-
-void GpFileStream_X_File::Close()
-{
-	this->~GpFileStream_X_File();
-	free(this);
-}
-
-void GpFileStream_X_File::Flush()
-{
-	fflush(m_f);
-}
-
-bool GpFileSystem_X::ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, std::string &resolution)
-{
-	const char *prefsAppend = nullptr;
-
-	switch (virtualDirectory)
-	{
-	case PortabilityLayer::VirtualDirectories::kApplicationData:
-		resolution = std::string("Packaged");
-		break;
-	case PortabilityLayer::VirtualDirectories::kGameData:
-		resolution = std::string("Packaged/Houses");
-		break;
-	case PortabilityLayer::VirtualDirectories::kFonts:
-		resolution = std::string("Resources");
-		break;
-	case PortabilityLayer::VirtualDirectories::kHighScores:
-		prefsAppend = "HighScores";
-		break;
-	case PortabilityLayer::VirtualDirectories::kUserData:
-		prefsAppend = "Houses";
-		break;
-	case PortabilityLayer::VirtualDirectories::kUserSaves:
-		prefsAppend = "SavedGames";
-		break;
-	case PortabilityLayer::VirtualDirectories::kPrefs:
-		prefsAppend = "Prefs";
-		break;
-	case PortabilityLayer::VirtualDirectories::kLogs:
-		prefsAppend = "Logs";
-		break;
-	default:
-		return false;
-	};
-
-	if (prefsAppend)
-		resolution = m_prefsPath + prefsAppend;
-	else
-		resolution = m_basePath + resolution;
-
-	for (size_t i = 0; i < numPaths; i++)
-	{
-		resolution += "/";
-		resolution += paths[i];
-	}
-	
-	return true;
-}
-
-GpFileSystem_X::GpFileSystem_X()
-	: m_delayCallback(nullptr)
-{
-}
-
-GpFileSystem_X::~GpFileSystem_X()
-{
-}
-
-void GpFileSystem_X::Init()
-{
-	char *prefsDir = SDL_GetPrefPath("aerofoil", "aerofoil");
-	m_prefsPath = prefsDir;
-
-	char *baseDir = SDL_GetBasePath();
-	m_basePath = baseDir;
-	SDL_free(baseDir);
-
-	char baseDirSeparator = m_basePath[m_basePath.size() - 1];
-	if (m_basePath.size() >= 4 && m_basePath.substr(m_basePath.size() - 4, 3) == "bin")
-		m_basePath = m_basePath.substr(0, m_basePath.size() - 4) + "lib" + baseDirSeparator + "aerofoil" + baseDirSeparator;
-
-	const char *extensions[] = { "HighScores", "Houses", "SavedGames", "Prefs", "Logs" };
-	for (size_t i = 0; i < sizeof(extensions) / sizeof(extensions[0]); i++)
-	{
-		std::string prefsPath = std::string(prefsDir) + extensions[i];
-		int created = mkdir(prefsPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-	}
-	SDL_free(prefsDir);
-}
-
-bool GpFileSystem_X::FileExists(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path)
-{
-	std::string resolvedPath;
-	if (!ResolvePath(virtualDirectory, &path, 1, resolvedPath))
-		return false;
-
-	struct stat s;
-	return stat(resolvedPath.c_str(), &s) == 0;
-}
-
-bool GpFileSystem_X::FileLocked(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &exists)
-{
-	std::string resolvedPath;
-	if (!ResolvePath(virtualDirectory, &path, 1, resolvedPath))
-	{
-		if (exists)
-			exists = false;
-		return false;
-	}
-
-	int permissions = access(resolvedPath.c_str(), W_OK | F_OK);
-	exists = ((permissions & F_OK) != 0);
-	return ((permissions & W_OK) != 0);
-}
-
-GpIOStream *GpFileSystem_X::OpenFileNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* subPaths, size_t numSubPaths, bool writeAccess, GpFileCreationDisposition_t createDisposition)
-{
-	const char *mode = nullptr;
-	bool canWrite = false;
-	bool needResetPosition = false;
-
-	switch (createDisposition)
-	{
-		case GpFileCreationDispositions::kCreateOrOverwrite:
-			mode = "wb";
-			break;
-		case GpFileCreationDispositions::kCreateNew:
-			mode = "x+b";
-			break;
-		case GpFileCreationDispositions::kCreateOrOpen:
-			mode = "a+b";
-			needResetPosition = true;
-			break;
-		case GpFileCreationDispositions::kOpenExisting:
-			mode = writeAccess ? "r+b" : "rb";
-			break;
-		case GpFileCreationDispositions::kOverwriteExisting:
-			mode = "r+b";
-			break;
-		default:
-			return nullptr;
-	};
-
-	if (virtualDirectory == PortabilityLayer::VirtualDirectories::kSourceExport)
-		return nullptr;
-
-	std::string resolvedPath;
-	
-	if (!ResolvePath(virtualDirectory, subPaths, numSubPaths, resolvedPath))
-		return nullptr;
-
-	void *objStorage = malloc(sizeof(GpFileStream_X_File));
-	if (!objStorage)
-		return nullptr;
-
-	FILE *f = fopen(resolvedPath.c_str(), mode);
-	if (!f)
-	{
-		free(objStorage);
-		return nullptr;
-	}
-
-	if (needResetPosition)
-		fseek(f, 0, SEEK_SET);
-
-	if (createDisposition == GpFileCreationDispositions::kOverwriteExisting)
-	{
-		if (ftruncate64(fileno(f), 0) < 0)
-		{
-			free(objStorage);
-			fclose(f);
-			return nullptr;
-		}
-	}
-
-	return new (objStorage) GpFileStream_X_File(f, !writeAccess, false);
-}
-
-bool GpFileSystem_X::DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed)
-{
-	std::string resolvedPath;
-	if (!ResolvePath(virtualDirectory, &path, 1, resolvedPath))
-	{
-		existed = false;
-		return false;
-	}
-
-	if (unlink(resolvedPath.c_str()) < 0)
-	{
-		existed = (errno != ENOENT);
-		return false;
-	}
-	existed = true;
-	return true;
-}
-
-bool GpFileSystem_X::ValidateFilePath(const char *path, size_t length) const
-{
-	for (size_t i = 0; i < length; i++)
-	{
-		const char c = path[i];
-		if (c >= '0' && c <= '9')
-			continue;
-
-		if (c == '_' || c == '.' || c == '\'' || c == '!')
-			continue;
-
-		if (c == ' ' && i != 0 && i != length - 1)
-			continue;
-
-		if (c >= 'a' && c <= 'z')
-			continue;
-
-		if (c >= 'A' && c <= 'Z')
-			continue;
-
-		return false;
-	}
-
-	return true;
-}
-
-bool GpFileSystem_X::ValidateFilePathUnicodeChar(uint32_t c) const
-{
-	if (c >= '0' && c <= '9')
-		return true;
-
-	if (c == '_' || c == '\'')
-		return true;
-
-	if (c == ' ')
-		return true;
-
-	if (c >= 'a' && c <= 'z')
-		return true;
-
-	if (c >= 'A' && c <= 'Z')
-		return true;
-
-	return false;
-}
-
-void GpFileSystem_X::SetDelayCallback(DelayCallback_t delayCallback)
-{
-	m_delayCallback = delayCallback;
-}
-
-GpFileSystem_X *GpFileSystem_X::GetInstance()
-{
-	return &ms_instance;
-}
-
-class GpDirectoryCursor_StringList final : public IGpDirectoryCursor
-{
-public:
-	explicit GpDirectoryCursor_StringList(std::vector<std::string> &paths);
-	~GpDirectoryCursor_StringList();
-
-	bool GetNext(const char *&outFileName) override;
-	void Destroy() override;
-
-private:
-	std::vector<std::string> m_paths;
-	size_t m_index;
-};
-
-GpDirectoryCursor_StringList::GpDirectoryCursor_StringList(std::vector<std::string> &paths)
-	: m_index(0)
-{
-	std::swap(paths, m_paths);
-}
-
-GpDirectoryCursor_StringList::~GpDirectoryCursor_StringList()
-{
-}
-
-bool GpDirectoryCursor_StringList::GetNext(const char *&outFileName)
-{
-	if (m_index == m_paths.size())
-		return false;
-	outFileName = m_paths[m_index].c_str();
-	m_index++;
-	return true;
-}
-
-void GpDirectoryCursor_StringList::Destroy()
-{
-	delete this;
-}
-
-class GpDirectoryCursor_POSIX final : public IGpDirectoryCursor
-{
-public:
-	explicit GpDirectoryCursor_POSIX(DIR *dir);
-	~GpDirectoryCursor_POSIX();
-
-	bool GetNext(const char *&outFileName) override;
-	void Destroy() override;
-
-private:
-	DIR *m_dir;
-};
-
-GpDirectoryCursor_POSIX::GpDirectoryCursor_POSIX(DIR *dir)
-	: m_dir(dir)
-{
-}
-
-GpDirectoryCursor_POSIX::~GpDirectoryCursor_POSIX()
-{
-	closedir(m_dir);
-}
-
-bool GpDirectoryCursor_POSIX::GetNext(const char *&outFileName)
-{
-	struct dirent *dir = readdir(m_dir);
-	if (!dir)
-		return false;
-
-	outFileName = dir->d_name;
-	return true;
-}
-
-void GpDirectoryCursor_POSIX::Destroy()
-{
-	delete this;
-}
-
-
-IGpDirectoryCursor *GpFileSystem_X::ScanDirectoryNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths)
-{
-	std::string resolvedPath;
-	std::vector<std::string> subPaths;
-	if (!ResolvePath(virtualDirectory, paths, numPaths, resolvedPath))
-		return nullptr;
-
-	DIR *d = opendir(resolvedPath.c_str());
-	if (!d)
-		return nullptr;
-
-	return new GpDirectoryCursor_POSIX(d);
-}
-
-
-GpFileSystem_X GpFileSystem_X::ms_instance;
+#define _LARGEFILE64_SOURCE
+#include "GpFileSystem_X.h"
+#include "GpIOStream.h"
+#include "IGpDirectoryCursor.h"
+#include "IGpSystemServices.h"
+#include "IGpMutex.h"
+#include "IGpThreadRelay.h"
+#include "VirtualDirectory.h"
+
+#include "PLDrivers.h"
+
+#ifdef __MACOS__
+#include <SDL.h>
+#include <SDL_rwops.h>
+#else
+#include "SDL2/SDL.h"
+#include "SDL2/SDL_rwops.h"
+#endif
+
+#include <string>
+#include <vector>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <errno.h>
+#include <dirent.h>
+
+#include "UTF8.h"
+
+#if defined(__CYGWIN__) || defined(__MACOS__) || defined(__linux)
+typedef off_t off64_t;
+#define fstat64 fstat
+#define fseek64 fseek
+#define ftruncate64 ftruncate
+#define stat64 stat
+#endif
+
+class GpFileStream_X_File final : public GpIOStream
+{
+public:
+	GpFileStream_X_File(FILE *f, bool readOnly, bool writeOnly);
+	~GpFileStream_X_File();
+
+	size_t Read(void *bytesOut, size_t size) override;
+	size_t Write(const void *bytes, size_t size) override;
+	bool IsSeekable() const override;
+	bool IsReadOnly() const override;
+	bool IsWriteOnly() const override;
+	bool SeekStart(GpUFilePos_t loc) override;
+	bool SeekCurrent(GpFilePos_t loc) override;
+	bool SeekEnd(GpUFilePos_t loc) override;
+	GpUFilePos_t Size() const override;
+	GpUFilePos_t Tell() const override;
+	void Close() override;
+	void Flush() override;
+
+private:
+	FILE *m_f;
+	bool m_seekable;
+	bool m_isReadOnly;
+	bool m_isWriteOnly;
+};
+
+
+GpFileStream_X_File::GpFileStream_X_File(FILE *f, bool readOnly, bool writeOnly)
+	: m_f(f)
+	, m_isReadOnly(readOnly)
+	, m_isWriteOnly(writeOnly)
+{
+	m_seekable = (fseek(m_f, 0, SEEK_CUR) == 0);
+}
+
+GpFileStream_X_File::~GpFileStream_X_File()
+{
+	fclose(m_f);
+}
+
+size_t GpFileStream_X_File::Read(void *bytesOut, size_t size)
+{
+	if (m_isWriteOnly)
+		return 0;
+	return fread(bytesOut, 1, size, m_f);
+}
+
+size_t GpFileStream_X_File::Write(const void *bytes, size_t size)
+{
+	if (m_isReadOnly)
+		return 0;
+	return fwrite(bytes, 1, size, m_f);
+}
+
+bool GpFileStream_X_File::IsSeekable() const
+{
+	return m_seekable;
+}
+
+bool GpFileStream_X_File::IsReadOnly() const
+{
+	return m_isReadOnly;
+}
+
+bool GpFileStream_X_File::IsWriteOnly() const
+{
+	return m_isWriteOnly;
+}
+
+bool GpFileStream_X_File::SeekStart(GpUFilePos_t loc)
+{
+	if (!m_seekable)
+		return false;
+
+	fflush(m_f);
+	return fseek64(m_f, static_cast<off64_t>(loc), SEEK_SET) >= 0;
+}
+
+bool GpFileStream_X_File::SeekCurrent(GpFilePos_t loc)
+{
+	if (!m_seekable)
+		return false;
+
+	fflush(m_f);
+	return fseek64(m_f, static_cast<off64_t>(loc), SEEK_CUR) >= 0;
+}
+
+bool GpFileStream_X_File::SeekEnd(GpUFilePos_t loc)
+{
+	if (!m_seekable)
+		return false;
+
+	fflush(m_f);
+	return fseek64(m_f, -static_cast<off64_t>(loc), SEEK_END) >= 0;
+}
+
+GpUFilePos_t GpFileStream_X_File::Size() const
+{
+	fflush(m_f);
+
+	struct stat64 s;
+	if (fstat64(fileno(m_f), &s) < 0)
+		return 0;
+
+	return static_cast<GpUFilePos_t>(s.st_size);
+}
+
+GpUFilePos_t GpFileStream_X_File::Tell() const
+{
+	return static_cast<GpUFilePos_t>(ftell(m_f));
+}
+
+void GpFileStream_X_File::Close()
+{
+	this->~GpFileStream_X_File();
+	free(this);
+}
+
+void GpFileStream_X_File::Flush()
+{
+	fflush(m_f);
+}
+
+bool GpFileSystem_X::ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, std::string &resolution)
+{
+	const char *prefsAppend = nullptr;
+
+	switch (virtualDirectory)
+	{
+	case PortabilityLayer::VirtualDirectories::kApplicationData:
+		resolution = std::string("Packaged");
+		break;
+	case PortabilityLayer::VirtualDirectories::kGameData:
+		resolution = std::string("Packaged/Houses");
+		break;
+	case PortabilityLayer::VirtualDirectories::kFonts:
+		resolution = std::string("Resources");
+		break;
+	case PortabilityLayer::VirtualDirectories::kHighScores:
+		prefsAppend = "HighScores";
+		break;
+	case PortabilityLayer::VirtualDirectories::kUserData:
+		prefsAppend = "Houses";
+		break;
+	case PortabilityLayer::VirtualDirectories::kUserSaves:
+		prefsAppend = "SavedGames";
+		break;
+	case PortabilityLayer::VirtualDirectories::kPrefs:
+		prefsAppend = "Prefs";
+		break;
+	case PortabilityLayer::VirtualDirectories::kLogs:
+		prefsAppend = "Logs";
+		break;
+	default:
+		return false;
+	};
+
+	if (prefsAppend)
+		resolution = m_prefsPath + prefsAppend;
+	else
+		resolution = m_basePath + resolution;
+
+	for (size_t i = 0; i < numPaths; i++)
+	{
+		resolution += "/";
+		resolution += paths[i];
+	}
+	
+	return true;
+}
+
+GpFileSystem_X::GpFileSystem_X()
+	: m_delayCallback(nullptr)
+{
+}
+
+GpFileSystem_X::~GpFileSystem_X()
+{
+}
+
+void GpFileSystem_X::Init()
+{
+	char *prefsDir = SDL_GetPrefPath("aerofoil", "aerofoil");
+	m_prefsPath = prefsDir;
+
+	char *baseDir = SDL_GetBasePath();
+	m_basePath = baseDir;
+	SDL_free(baseDir);
+
+	char baseDirSeparator = m_basePath[m_basePath.size() - 1];
+	if (m_basePath.size() >= 4 && m_basePath.substr(m_basePath.size() - 4, 3) == "bin")
+		m_basePath = m_basePath.substr(0, m_basePath.size() - 4) + "lib" + baseDirSeparator + "aerofoil" + baseDirSeparator;
+
+	const char *extensions[] = { "HighScores", "Houses", "SavedGames", "Prefs", "Logs" };
+	for (size_t i = 0; i < sizeof(extensions) / sizeof(extensions[0]); i++)
+	{
+		std::string prefsPath = std::string(prefsDir) + extensions[i];
+		int created = mkdir(prefsPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+	}
+	SDL_free(prefsDir);
+}
+
+bool GpFileSystem_X::FileExists(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path)
+{
+	std::string resolvedPath;
+	if (!ResolvePath(virtualDirectory, &path, 1, resolvedPath))
+		return false;
+
+	struct stat s;
+	return stat(resolvedPath.c_str(), &s) == 0;
+}
+
+bool GpFileSystem_X::FileLocked(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &exists)
+{
+	std::string resolvedPath;
+	if (!ResolvePath(virtualDirectory, &path, 1, resolvedPath))
+	{
+		if (exists)
+			exists = false;
+		return false;
+	}
+
+	int permissions = access(resolvedPath.c_str(), W_OK | F_OK);
+	exists = ((permissions & F_OK) != 0);
+	return ((permissions & W_OK) != 0);
+}
+
+GpIOStream *GpFileSystem_X::OpenFileNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* subPaths, size_t numSubPaths, bool writeAccess, GpFileCreationDisposition_t createDisposition)
+{
+	const char *mode = nullptr;
+	bool canWrite = false;
+	bool needResetPosition = false;
+
+	switch (createDisposition)
+	{
+		case GpFileCreationDispositions::kCreateOrOverwrite:
+			mode = "wb";
+			break;
+		case GpFileCreationDispositions::kCreateNew:
+			mode = "x+b";
+			break;
+		case GpFileCreationDispositions::kCreateOrOpen:
+			mode = "a+b";
+			needResetPosition = true;
+			break;
+		case GpFileCreationDispositions::kOpenExisting:
+			mode = writeAccess ? "r+b" : "rb";
+			break;
+		case GpFileCreationDispositions::kOverwriteExisting:
+			mode = "r+b";
+			break;
+		default:
+			return nullptr;
+	};
+
+	if (virtualDirectory == PortabilityLayer::VirtualDirectories::kSourceExport)
+		return nullptr;
+
+	std::string resolvedPath;
+	
+	if (!ResolvePath(virtualDirectory, subPaths, numSubPaths, resolvedPath))
+		return nullptr;
+
+	void *objStorage = malloc(sizeof(GpFileStream_X_File));
+	if (!objStorage)
+		return nullptr;
+
+	FILE *f = fopen(resolvedPath.c_str(), mode);
+	if (!f)
+	{
+		fprintf(stderr, "GpFileSystem_X: Cannot open \"%s\"\n",
+				resolvedPath.c_str());
+		free(objStorage);
+		return nullptr;
+	}
+
+	if (needResetPosition)
+		fseek(f, 0, SEEK_SET);
+
+	if (createDisposition == GpFileCreationDispositions::kOverwriteExisting)
+	{
+		if (ftruncate64(fileno(f), 0) < 0)
+		{
+			free(objStorage);
+			fclose(f);
+			return nullptr;
+		}
+	}
+
+	return new (objStorage) GpFileStream_X_File(f, !writeAccess, false);
+}
+
+bool GpFileSystem_X::DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed)
+{
+	std::string resolvedPath;
+	if (!ResolvePath(virtualDirectory, &path, 1, resolvedPath))
+	{
+		existed = false;
+		return false;
+	}
+
+	if (unlink(resolvedPath.c_str()) < 0)
+	{
+		existed = (errno != ENOENT);
+		return false;
+	}
+	existed = true;
+	return true;
+}
+
+bool GpFileSystem_X::ValidateFilePath(const char *path, size_t length) const
+{
+	for (size_t i = 0; i < length; i++)
+	{
+		const char c = path[i];
+		if (c >= '0' && c <= '9')
+			continue;
+
+		if (c == '_' || c == '.' || c == '\'' || c == '!')
+			continue;
+
+		if (c == ' ' && i != 0 && i != length - 1)
+			continue;
+
+		if (c >= 'a' && c <= 'z')
+			continue;
+
+		if (c >= 'A' && c <= 'Z')
+			continue;
+
+		return false;
+	}
+
+	return true;
+}
+
+bool GpFileSystem_X::ValidateFilePathUnicodeChar(uint32_t c) const
+{
+	if (c >= '0' && c <= '9')
+		return true;
+
+	if (c == '_' || c == '\'')
+		return true;
+
+	if (c == ' ')
+		return true;
+
+	if (c >= 'a' && c <= 'z')
+		return true;
+
+	if (c >= 'A' && c <= 'Z')
+		return true;
+
+	return false;
+}
+
+void GpFileSystem_X::SetDelayCallback(DelayCallback_t delayCallback)
+{
+	m_delayCallback = delayCallback;
+}
+
+GpFileSystem_X *GpFileSystem_X::GetInstance()
+{
+	return &ms_instance;
+}
+
+class GpDirectoryCursor_StringList final : public IGpDirectoryCursor
+{
+public:
+	explicit GpDirectoryCursor_StringList(std::vector<std::string> &paths);
+	~GpDirectoryCursor_StringList();
+
+	bool GetNext(const char *&outFileName) override;
+	void Destroy() override;
+
+private:
+	std::vector<std::string> m_paths;
+	size_t m_index;
+};
+
+GpDirectoryCursor_StringList::GpDirectoryCursor_StringList(std::vector<std::string> &paths)
+	: m_index(0)
+{
+	std::swap(paths, m_paths);
+}
+
+GpDirectoryCursor_StringList::~GpDirectoryCursor_StringList()
+{
+}
+
+bool GpDirectoryCursor_StringList::GetNext(const char *&outFileName)
+{
+	if (m_index == m_paths.size())
+		return false;
+	outFileName = m_paths[m_index].c_str();
+	m_index++;
+	return true;
+}
+
+void GpDirectoryCursor_StringList::Destroy()
+{
+	delete this;
+}
+
+class GpDirectoryCursor_POSIX final : public IGpDirectoryCursor
+{
+public:
+	explicit GpDirectoryCursor_POSIX(DIR *dir);
+	~GpDirectoryCursor_POSIX();
+
+	bool GetNext(const char *&outFileName) override;
+	void Destroy() override;
+
+private:
+	DIR *m_dir;
+};
+
+GpDirectoryCursor_POSIX::GpDirectoryCursor_POSIX(DIR *dir)
+	: m_dir(dir)
+{
+}
+
+GpDirectoryCursor_POSIX::~GpDirectoryCursor_POSIX()
+{
+	closedir(m_dir);
+}
+
+bool GpDirectoryCursor_POSIX::GetNext(const char *&outFileName)
+{
+	struct dirent *dir = readdir(m_dir);
+	if (!dir)
+		return false;
+
+	outFileName = dir->d_name;
+	return true;
+}
+
+void GpDirectoryCursor_POSIX::Destroy()
+{
+	delete this;
+}
+
+
+IGpDirectoryCursor *GpFileSystem_X::ScanDirectoryNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths)
+{
+	std::string resolvedPath;
+	std::vector<std::string> subPaths;
+	if (!ResolvePath(virtualDirectory, paths, numPaths, resolvedPath))
+		return nullptr;
+
+	DIR *d = opendir(resolvedPath.c_str());
+	if (!d)
+		return nullptr;
+
+	return new GpDirectoryCursor_POSIX(d);
+}
+
+
+GpFileSystem_X GpFileSystem_X::ms_instance;

AerofoilX/GpFileSystem_X.h

@@ -1,42 +1,42 @@
-#pragma once
-
-#include "IGpFileSystem.h"
-
-#include "GpCoreDefs.h"
-
-#include <string>
-#include <stdio.h>
-
-struct IGpMutex;
-
-class GpFileSystem_X final : public IGpFileSystem
-{
-public:
-	GpFileSystem_X();
-	~GpFileSystem_X();
-	
-	void Init();
-
-	bool FileExists(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path) override;
-	bool FileLocked(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &exists) override;
-	GpIOStream *OpenFileNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* subPaths, size_t numSubPaths, bool writeAccess, GpFileCreationDisposition_t createDisposition) override;
-	bool DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed) override;
-	IGpDirectoryCursor *ScanDirectoryNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths) override;
-
-	bool ValidateFilePath(const char *path, size_t pathLen) const override;
-	bool ValidateFilePathUnicodeChar(uint32_t ch) const override;
-
-	void SetDelayCallback(DelayCallback_t delayCallback) override;
-
-	static GpFileSystem_X *GetInstance();
-
-private:
-	bool ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, std::string &resolution);
-
-	DelayCallback_t m_delayCallback;
-
-	std::string m_prefsPath;
-	std::string m_basePath;
-
-	static GpFileSystem_X ms_instance;
-};
+#pragma once
+
+#include "IGpFileSystem.h"
+
+#include "GpCoreDefs.h"
+
+#include <string>
+#include <stdio.h>
+
+struct IGpMutex;
+
+class GpFileSystem_X final : public IGpFileSystem
+{
+public:
+	GpFileSystem_X();
+	~GpFileSystem_X();
+	
+	void Init();
+
+	bool FileExists(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path) override;
+	bool FileLocked(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &exists) override;
+	GpIOStream *OpenFileNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* subPaths, size_t numSubPaths, bool writeAccess, GpFileCreationDisposition_t createDisposition) override;
+	bool DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed) override;
+	IGpDirectoryCursor *ScanDirectoryNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths) override;
+
+	bool ValidateFilePath(const char *path, size_t pathLen) const override;
+	bool ValidateFilePathUnicodeChar(uint32_t ch) const override;
+
+	void SetDelayCallback(DelayCallback_t delayCallback) override;
+
+	static GpFileSystem_X *GetInstance();
+
+private:
+	bool ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* paths, size_t numPaths, std::string &resolution);
+
+	DelayCallback_t m_delayCallback;
+
+	std::string m_prefsPath;
+	std::string m_basePath;
+
+	static GpFileSystem_X ms_instance;
+};

AerofoilX/GpMain_SDL_X.cpp

@@ -1,100 +1,100 @@
-#include "SDL.h"
-#include "SDL_main.h"
-
-#include "GpMain.h"
-#include "GpAllocator_C.h"
-#include "GpAudioDriverFactory.h"
-#include "GpDisplayDriverFactory.h"
-#include "GpGlobalConfig.h"
-#include "GpFileSystem_X.h"
-#include "GpLogDriver_X.h"
-#include "GpFontHandlerFactory.h"
-#include "GpInputDriverFactory.h"
-#include "GpAppInterface.h"
-#include "GpSystemServices_X.h"
-#include "GpVOSEvent.h"
-#include "GpX.h"
-
-#include "IGpFileSystem.h"
-#include "IGpThreadEvent.h"
-#include "IGpVOSEventQueue.h"
-
-#include <string>
-#ifdef __MACOS__
-#include "MacInit.h"
-#endif
-
-GpXGlobals g_gpXGlobals;
-
-IGpDisplayDriver *GpDriver_CreateDisplayDriver_SDL_GL2(const GpDisplayDriverProperties &properties);
-IGpAudioDriver *GpDriver_CreateAudioDriver_SDL(const GpAudioDriverProperties &properties);
-IGpInputDriver *GpDriver_CreateInputDriver_SDL2_Gamepad(const GpInputDriverProperties &properties);
-
-#ifdef __MACOS__
-int main(int argc, char *argv[])
-#else
-SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[])
-#endif
-{
-	bool enableLogging = false;
-	for (int i = 1; i < argc; i++)
-	{
-		if (!strcmp(argv[i], "-diagnostics"))
-			enableLogging = true;
-	}
-
-#ifndef __MACOS__
-	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER) < 0)
-#else
-	if (MacInit())
-#endif
-		return -1;
-
-	GpFileSystem_X::GetInstance()->Init();
-
-	IGpLogDriver *logger = nullptr;
-	
-	if (enableLogging)
-	{
-		GpLogDriver_X::Init();
-		logger = GpLogDriver_X::GetInstance();
-	}
-
-	GpDriverCollection *drivers = GpAppInterface_Get()->PL_GetDriverCollection();
-
-	drivers->SetDriver<GpDriverIDs::kFileSystem>(GpFileSystem_X::GetInstance());
-	drivers->SetDriver<GpDriverIDs::kSystemServices>(GpSystemServices_X::GetInstance());
-	drivers->SetDriver<GpDriverIDs::kLog>(GpLogDriver_X::GetInstance());
-	drivers->SetDriver<GpDriverIDs::kAlloc>(GpAllocator_C::GetInstance());
-
-	g_gpGlobalConfig.m_displayDriverType = EGpDisplayDriverType_SDL_GL2;
-	g_gpGlobalConfig.m_audioDriverType = EGpAudioDriverType_SDL2;
-	g_gpGlobalConfig.m_fontHandlerType = EGpFontHandlerType_None;
-
-	EGpInputDriverType inputDrivers[] =
-	{
-		EGpInputDriverType_SDL2_Gamepad
-	};
-
-	g_gpGlobalConfig.m_inputDriverTypes = inputDrivers;
-	g_gpGlobalConfig.m_numInputDrivers = sizeof(inputDrivers) / sizeof(inputDrivers[0]);
-
-	g_gpGlobalConfig.m_osGlobals = &g_gpXGlobals;
-	g_gpGlobalConfig.m_logger = logger;
-	g_gpGlobalConfig.m_systemServices = GpSystemServices_X::GetInstance();
-	g_gpGlobalConfig.m_allocator = GpAllocator_C::GetInstance();
-
-	GpDisplayDriverFactory::RegisterDisplayDriverFactory(EGpDisplayDriverType_SDL_GL2, GpDriver_CreateDisplayDriver_SDL_GL2);
-	GpAudioDriverFactory::RegisterAudioDriverFactory(EGpAudioDriverType_SDL2, GpDriver_CreateAudioDriver_SDL);
-	GpInputDriverFactory::RegisterInputDriverFactory(EGpInputDriverType_SDL2_Gamepad, GpDriver_CreateInputDriver_SDL2_Gamepad);
-
-	if (logger)
-		logger->Printf(IGpLogDriver::Category_Information, "SDL environment configured, starting up");
-
-	int returnCode = GpMain::Run();
-
-	if (logger)
-		logger->Printf(IGpLogDriver::Category_Information, "SDL environment exited with code %i, cleaning up", returnCode);
-
-	return returnCode;
-}
+#include "SDL.h"
+#include "SDL_main.h"
+
+#include "GpMain.h"
+#include "GpAllocator_C.h"
+#include "GpAudioDriverFactory.h"
+#include "GpDisplayDriverFactory.h"
+#include "GpGlobalConfig.h"
+#include "GpFileSystem_X.h"
+#include "GpLogDriver_X.h"
+#include "GpFontHandlerFactory.h"
+#include "GpInputDriverFactory.h"
+#include "GpAppInterface.h"
+#include "GpSystemServices_X.h"
+#include "GpVOSEvent.h"
+#include "GpX.h"
+
+#include "IGpFileSystem.h"
+#include "IGpThreadEvent.h"
+#include "IGpVOSEventQueue.h"
+
+#include <string>
+#ifdef __MACOS__
+#include "MacInit.h"
+#endif
+
+GpXGlobals g_gpXGlobals;
+
+IGpDisplayDriver *GpDriver_CreateDisplayDriver_SDL_GL2(const GpDisplayDriverProperties &properties);
+IGpAudioDriver *GpDriver_CreateAudioDriver_SDL(const GpAudioDriverProperties &properties);
+IGpInputDriver *GpDriver_CreateInputDriver_SDL2_Gamepad(const GpInputDriverProperties &properties);
+
+#ifndef _WIN32
+int main(int argc, char *argv[])
+#else
+SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[])
+#endif
+{
+	bool enableLogging = false;
+	for (int i = 1; i < argc; i++)
+	{
+		if (!strcmp(argv[i], "-diagnostics"))
+			enableLogging = true;
+	}
+
+#ifndef __MACOS__
+	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER) < 0)
+#else
+	if (MacInit())
+#endif
+		return -1;
+
+	GpFileSystem_X::GetInstance()->Init();
+
+	IGpLogDriver *logger = nullptr;
+	
+	if (enableLogging)
+	{
+		GpLogDriver_X::Init();
+		logger = GpLogDriver_X::GetInstance();
+	}
+
+	GpDriverCollection *drivers = GpAppInterface_Get()->PL_GetDriverCollection();
+
+	drivers->SetDriver<GpDriverIDs::kFileSystem>(GpFileSystem_X::GetInstance());
+	drivers->SetDriver<GpDriverIDs::kSystemServices>(GpSystemServices_X::GetInstance());
+	drivers->SetDriver<GpDriverIDs::kLog>(GpLogDriver_X::GetInstance());
+	drivers->SetDriver<GpDriverIDs::kAlloc>(GpAllocator_C::GetInstance());
+
+	g_gpGlobalConfig.m_displayDriverType = EGpDisplayDriverType_SDL_GL2;
+	g_gpGlobalConfig.m_audioDriverType = EGpAudioDriverType_SDL2;
+	g_gpGlobalConfig.m_fontHandlerType = EGpFontHandlerType_None;
+
+	EGpInputDriverType inputDrivers[] =
+	{
+		EGpInputDriverType_SDL2_Gamepad
+	};
+
+	g_gpGlobalConfig.m_inputDriverTypes = inputDrivers;
+	g_gpGlobalConfig.m_numInputDrivers = sizeof(inputDrivers) / sizeof(inputDrivers[0]);
+
+	g_gpGlobalConfig.m_osGlobals = &g_gpXGlobals;
+	g_gpGlobalConfig.m_logger = logger;
+	g_gpGlobalConfig.m_systemServices = GpSystemServices_X::GetInstance();
+	g_gpGlobalConfig.m_allocator = GpAllocator_C::GetInstance();
+
+	GpDisplayDriverFactory::RegisterDisplayDriverFactory(EGpDisplayDriverType_SDL_GL2, GpDriver_CreateDisplayDriver_SDL_GL2);
+	GpAudioDriverFactory::RegisterAudioDriverFactory(EGpAudioDriverType_SDL2, GpDriver_CreateAudioDriver_SDL);
+	GpInputDriverFactory::RegisterInputDriverFactory(EGpInputDriverType_SDL2_Gamepad, GpDriver_CreateInputDriver_SDL2_Gamepad);
+
+	if (logger)
+		logger->Printf(IGpLogDriver::Category_Information, "SDL environment configured, starting up");
+
+	int returnCode = GpMain::Run();
+
+	if (logger)
+		logger->Printf(IGpLogDriver::Category_Information, "SDL environment exited with code %i, cleaning up", returnCode);
+
+	return returnCode;
+}

AerofoilX/GpSystemServices_X.cpp

@@ -3,16 +3,13 @@
 #include "IGpClipboardContents.h"
 #include "IGpThreadEvent.h"
 
-#ifdef __MACOS__
 #include <SDL.h>
 #include <pthread.h>
-#else
-#include "SDL2/SDL.h"
-#endif
-
 #include <time.h>
 #include <unistd.h>
 #include <string>
+#include <string.h>
+#include <stdlib.h>
 
 struct GpSystemServices_X_ThreadStartParams
 {
@@ -52,13 +49,19 @@ void *GpSystemServices_X::CreateThread(ThreadFunc_t threadFunc, void *context)
 	if (!evt)
 		return nullptr;
 
+	pthread_t *threadPtr = static_cast<pthread_t*>(malloc(sizeof(pthread_t)));
+	if (!threadPtr)
+	{
+		evt->Destroy();
+		return nullptr;
+	}
+
 	GpSystemServices_X_ThreadStartParams startParams;
 	startParams.m_threadContext = context;
 	startParams.m_threadFunc = threadFunc;
 	startParams.m_threadStartEvent = evt;
 
-	pthread_t thread = nullptr;
-	if (pthread_create(&thread, nullptr, StaticStartThread, &startParams) != 0)
+	if (pthread_create(threadPtr, nullptr, StaticStartThread, &startParams) != 0)
 	{
 		evt->Destroy();
 		return nullptr;
@@ -67,7 +70,7 @@ void *GpSystemServices_X::CreateThread(ThreadFunc_t threadFunc, void *context)
 	evt->Wait();
 	evt->Destroy();
 
-	return thread;
+	return static_cast<void*>(threadPtr);
 }
 
 bool GpSystemServices_X::Beep() const

ApplicationResourcePatches/DITL/1017.json

@@ -1,133 +1,133 @@
-{
-	"items" :
-	[
-		{
-			"name" : "Okay",
-			"itemType" : "Button",
-			"pos" : [ 267, 211 ],
-			"size" : [ 58, 20 ],
-			"id" : 0,
-			"enabled" : true
-		},
-		{
-			"name" : "Cancel",
-			"itemType" : "Button",
-			"pos" : [ 201, 211 ],
-			"size" : [ 58, 20 ],
-			"id" : 0,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "Icon",
-			"pos" : [ 209, 40 ],
-			"size" : [ 32, 32 ],
-			"id" : 1020,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "Icon",
-			"pos" : [ 249, 40 ],
-			"size" : [ 32, 32 ],
-			"id" : 1021,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "Icon",
-			"pos" : [ 289, 40 ],
-			"size" : [ 32, 32 ],
-			"id" : 1022,
-			"enabled" : true
-		},
-		{
-			"name" : "Number of Rooms to Display:\r(the less rooms, the faster)",
-			"itemType" : "Label",
-			"pos" : [ 8, 40 ],
-			"size" : [ 195, 32 ],
-			"id" : 0,
-			"enabled" : false
-		},
-		{
-			"name" : "",
-			"itemType" : "Image",
-			"pos" : [ 0, 0 ],
-			"size" : [ 333, 32 ],
-			"id" : 1006,
-			"enabled" : false
-		},
-		{
-			"name" : "",
-			"itemType" : "UserItem",
-			"pos" : [ 8, 80 ],
-			"size" : [ 317, 1 ],
-			"id" : 0,
-			"enabled" : false
-		},
-		{
-			"name" : "32-bit color (Requires restart)",
-			"itemType" : "CheckBox",
-			"pos" : [ 8, 85 ],
-			"size" : [ 256, 18 ],
-			"id" : 0,
-			"enabled" : true
-		},
-		{
-			"name" : "Scale to fit window",
-			"itemType" : "CheckBox",
-			"pos" : [ 8, 105 ],
-			"size" : [ 256, 18 ],
-			"id" : 0,
-			"enabled" : true
-		},
-		{
-			"name" : "Simulate Apple RGB monitor",
-			"itemType" : "CheckBox",
-			"pos" : [ 8, 125 ],
-			"size" : [ 256, 18 ],
-			"id" : 0,
-			"enabled" : true
-		},
-		{
-			"name" : "Beautiful opening color fade",
-			"itemType" : "CheckBox",
-			"pos" : [ 8, 152 ],
-			"size" : [ 256, 18 ],
-			"id" : 0,
-			"enabled" : true
-		},
-		{
-			"name" : "Full screen mode",
-			"itemType" : "CheckBox",
-			"pos" : [ 8, 172 ],
-			"size" : [ 256, 18 ],
-			"id" : 0,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "UserItem",
-			"pos" : [ 8, 147 ],
-			"size" : [ 317, 1 ],
-			"id" : 0,
-			"enabled" : false
-		},
-		{
-			"name" : "",
-			"itemType" : "UserItem",
-			"pos" : [ 8, 200 ],
-			"size" : [ 317, 1 ],
-			"id" : 0,
-			"enabled" : false
-		},
-		{
-			"name" : "Defaults",
-			"itemType" : "Button",
-			"pos" : [ 8, 211 ],
-			"size" : [ 64, 20 ],
-			"id" : 0,
-			"enabled" : true
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 267, 211 ],
+			"size" : [ 58, 20 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "Cancel",
+			"itemType" : "Button",
+			"pos" : [ 201, 211 ],
+			"size" : [ 58, 20 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "Icon",
+			"pos" : [ 209, 40 ],
+			"size" : [ 32, 32 ],
+			"id" : 1020,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "Icon",
+			"pos" : [ 249, 40 ],
+			"size" : [ 32, 32 ],
+			"id" : 1021,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "Icon",
+			"pos" : [ 289, 40 ],
+			"size" : [ 32, 32 ],
+			"id" : 1022,
+			"enabled" : true
+		},
+		{
+			"name" : "Number of Rooms to Display:\r(the less rooms, the faster)",
+			"itemType" : "Label",
+			"pos" : [ 8, 40 ],
+			"size" : [ 195, 32 ],
+			"id" : 0,
+			"enabled" : false
+		},
+		{
+			"name" : "",
+			"itemType" : "Image",
+			"pos" : [ 0, 0 ],
+			"size" : [ 333, 32 ],
+			"id" : 1006,
+			"enabled" : false
+		},
+		{
+			"name" : "",
+			"itemType" : "UserItem",
+			"pos" : [ 8, 80 ],
+			"size" : [ 317, 1 ],
+			"id" : 0,
+			"enabled" : false
+		},
+		{
+			"name" : "32-bit color (Requires restart)",
+			"itemType" : "CheckBox",
+			"pos" : [ 8, 85 ],
+			"size" : [ 256, 18 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "Scale to fit window",
+			"itemType" : "CheckBox",
+			"pos" : [ 8, 105 ],
+			"size" : [ 256, 18 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "Simulate Apple RGB monitor",
+			"itemType" : "CheckBox",
+			"pos" : [ 8, 125 ],
+			"size" : [ 256, 18 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "Beautiful opening color fade",
+			"itemType" : "CheckBox",
+			"pos" : [ 8, 152 ],
+			"size" : [ 256, 18 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "Full screen mode",
+			"itemType" : "CheckBox",
+			"pos" : [ 8, 172 ],
+			"size" : [ 256, 18 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "UserItem",
+			"pos" : [ 8, 147 ],
+			"size" : [ 317, 1 ],
+			"id" : 0,
+			"enabled" : false
+		},
+		{
+			"name" : "",
+			"itemType" : "UserItem",
+			"pos" : [ 8, 200 ],
+			"size" : [ 317, 1 ],
+			"id" : 0,
+			"enabled" : false
+		},
+		{
+			"name" : "Defaults",
+			"itemType" : "Button",
+			"pos" : [ 8, 211 ],
+			"size" : [ 64, 20 ],
+			"id" : 0,
+			"enabled" : true
+		}
+	]
 }

ApplicationResourcePatches/DITL/2000.json

@@ -1,21 +1,21 @@
-{
-	"items" :
-	[
-		{
-			"name" : "Okay",
-			"itemType" : "Button",
-			"pos" : [ 376, 300 ],
-			"size" : [ 58, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Third Party/Licensing Info...",
-			"itemType" : "Button",
-			"pos" : [ 176, 300 ],
-			"size" : [ 190, 20 ],
-			"id" : 1,
-			"enabled" : true
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 376, 300 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Third Party/Licensing Info...",
+			"itemType" : "Button",
+			"pos" : [ 176, 300 ],
+			"size" : [ 190, 20 ],
+			"id" : 1,
+			"enabled" : true
+		}
+	]
 }

ApplicationResourcePatches/DITL/2001.json

@@ -1,53 +1,53 @@
-{
-	"items" :
-	[
-		{
-			"name" : "Okay",
-			"itemType" : "Button",
-			"pos" : [ 376, 240 ],
-			"size" : [ 58, 20 ],
-			"id" : 1,
-			"enabled" : false
-		},
-		{
-			"name" : "Cancel",
-			"itemType" : "Button",
-			"pos" : [ 302, 240 ],
-			"size" : [ 58, 20 ],
-			"id" : 2,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "CustomControl",
-			"pos" : [ 17, 33 ],
-			"size" : [ 401, 190 ],
-			"id" : 3,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "CustomControl",
-			"pos" : [ 418, 32 ],
-			"size" : [ 16, 192 ],
-			"id" : 4,
-			"enabled" : true
-		},
-		{
-			"name" : "Delete",
-			"itemType" : "Button",
-			"pos" : [ 228, 240 ],
-			"size" : [ 58, 20 ],
-			"id" : 5,
-			"enabled" : false
-		},
-		{
-			"name" : "^0",
-			"itemType" : "Label",
-			"pos" : [ 16, 16 ],
-			"size" : [ 418, 16 ],
-			"id" : 10,
-			"enabled" : true
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 376, 240 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : false
+		},
+		{
+			"name" : "Cancel",
+			"itemType" : "Button",
+			"pos" : [ 302, 240 ],
+			"size" : [ 58, 20 ],
+			"id" : 2,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "CustomControl",
+			"pos" : [ 17, 33 ],
+			"size" : [ 401, 190 ],
+			"id" : 3,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "CustomControl",
+			"pos" : [ 418, 32 ],
+			"size" : [ 16, 192 ],
+			"id" : 4,
+			"enabled" : true
+		},
+		{
+			"name" : "Delete",
+			"itemType" : "Button",
+			"pos" : [ 228, 240 ],
+			"size" : [ 58, 20 ],
+			"id" : 5,
+			"enabled" : false
+		},
+		{
+			"name" : "^0",
+			"itemType" : "Label",
+			"pos" : [ 16, 16 ],
+			"size" : [ 418, 16 ],
+			"id" : 10,
+			"enabled" : true
+		}
+	]
 }

ApplicationResourcePatches/DITL/2002.json

@@ -1,53 +1,53 @@
-{
-	"items" :
-	[
-		{
-			"name" : "Okay",
-			"itemType" : "Button",
-			"pos" : [ 376, 240 ],
-			"size" : [ 58, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Cancel",
-			"itemType" : "Button",
-			"pos" : [ 302, 240 ],
-			"size" : [ 58, 20 ],
-			"id" : 2,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "CustomControl",
-			"pos" : [ 17, 33 ],
-			"size" : [ 401, 186 ],
-			"id" : 2,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "CustomControl",
-			"pos" : [ 418, 32 ],
-			"size" : [ 16, 188 ],
-			"id" : 3,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "EditBox",
-			"pos" : [ 16, 240 ],
-			"size" : [ 270, 16 ],
-			"id" : 4,
-			"enabled" : true
-		},
-		{
-			"name" : "^0",
-			"itemType" : "Label",
-			"pos" : [ 16, 16 ],
-			"size" : [ 418, 16 ],
-			"id" : 10,
-			"enabled" : true
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 376, 240 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Cancel",
+			"itemType" : "Button",
+			"pos" : [ 302, 240 ],
+			"size" : [ 58, 20 ],
+			"id" : 2,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "CustomControl",
+			"pos" : [ 17, 33 ],
+			"size" : [ 401, 186 ],
+			"id" : 2,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "CustomControl",
+			"pos" : [ 418, 32 ],
+			"size" : [ 16, 188 ],
+			"id" : 3,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "EditBox",
+			"pos" : [ 16, 240 ],
+			"size" : [ 270, 16 ],
+			"id" : 4,
+			"enabled" : true
+		},
+		{
+			"name" : "^0",
+			"itemType" : "Label",
+			"pos" : [ 16, 16 ],
+			"size" : [ 418, 16 ],
+			"id" : 10,
+			"enabled" : true
+		}
+	]
 }

ApplicationResourcePatches/DITL/2003.json

@@ -1,29 +1,29 @@
-{
-	"items" :
-	[
-		{
-			"name" : "No",
-			"itemType" : "Button",
-			"pos" : [ 253, 99 ],
-			"size" : [ 58, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Yes",
-			"itemType" : "Button",
-			"pos" : [ 184, 99 ],
-			"size" : [ 58, 20 ],
-			"id" : 2,
-			"enabled" : true
-		},
-		{
-			"name" : "^0 already exists.\rDo you want to replace it?",
-			"itemType" : "Label",
-			"pos" : [ 16, 16 ],
-			"size" : [ 295, 74 ],
-			"id" : 0,
-			"enabled" : false
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "No",
+			"itemType" : "Button",
+			"pos" : [ 253, 99 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Yes",
+			"itemType" : "Button",
+			"pos" : [ 184, 99 ],
+			"size" : [ 58, 20 ],
+			"id" : 2,
+			"enabled" : true
+		},
+		{
+			"name" : "^0 already exists.\rDo you want to replace it?",
+			"itemType" : "Label",
+			"pos" : [ 16, 16 ],
+			"size" : [ 295, 74 ],
+			"id" : 0,
+			"enabled" : false
+		}
+	]
 }

ApplicationResourcePatches/DITL/2004.json

@@ -1,21 +1,21 @@
-{
-	"items" :
-	[
-		{
-			"name" : "Okay",
-			"itemType" : "Button",
-			"pos" : [ 253, 99 ],
-			"size" : [ 58, 20 ],
-			"id" : 0,
-			"enabled" : true
-		},
-		{
-			"name" : "The file name that you've specified is invalid.",
-			"itemType" : "Label",
-			"pos" : [ 16, 16 ],
-			"size" : [ 295, 74 ],
-			"id" : 0,
-			"enabled" : false
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 253, 99 ],
+			"size" : [ 58, 20 ],
+			"id" : 0,
+			"enabled" : true
+		},
+		{
+			"name" : "The file name that you've specified is invalid.",
+			"itemType" : "Label",
+			"pos" : [ 16, 16 ],
+			"size" : [ 295, 74 ],
+			"id" : 0,
+			"enabled" : false
+		}
+	]
 }

ApplicationResourcePatches/DITL/2005.json

@@ -1,197 +1,197 @@
-{
-	"items" :
-	[
-		{
-			"name" : "Okay",
-			"itemType" : "Button",
-			"pos" : [ 438, 316 ],
-			"size" : [ 58, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Export Source Code to ZIP Archive...",
-			"itemType" : "Button",
-			"pos" : [ 205, 316 ],
-			"size" : [ 226, 20 ],
-			"id" : 1,
-			"enabled" : false
-		},
-		{
-			"name" : "Aerofoil ©2019-2021 Gale Force Games LLC",
-			"itemType" : "Label",
-			"pos" : [ 16, 21 ],
-			"size" : [ 406, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 16 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Based on Glider PRO ©1994-2000 Casady & Greene, Inc., created by John Calhoun",
-			"itemType" : "Label",
-			"pos" : [ 16, 44 ],
-			"size" : [ 398, 28 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 44 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Open Sans font ©2011 Google",
-			"itemType" : "Label",
-			"pos" : [ 16, 77 ],
-			"size" : [ 406, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 72 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Roboto Mono font ©2015 Google",
-			"itemType" : "Label",
-			"pos" : [ 16, 101 ],
-			"size" : [ 406, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 96 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Gochi Hand font ©2011 Juan Pablo del Peral",
-			"itemType" : "Label",
-			"pos" : [ 16, 125 ],
-			"size" : [ 406, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 120 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Inter font ©2016-2019 Rasmus Andersson + Inter Project Authors",
-			"itemType" : "Label",
-			"pos" : [ 16, 149 ],
-			"size" : [ 406, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 144 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "LIBICONV ©1999-2001, 2016 Free Software Foundation, Inc.",
-			"itemType" : "Label",
-			"pos" : [ 16, 173 ],
-			"size" : [ 406, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 168 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "RapidJSON ©2015 THL A29 Limited, a Tencent company, and Milo Yip",
-			"itemType" : "Label",
-			"pos" : [ 16, 194 ],
-			"size" : [ 406, 28 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 196 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "zlib ©1995-2017 Jean-loup Gailly and Mark Adler",
-			"itemType" : "Label",
-			"pos" : [ 16, 229 ],
-			"size" : [ 406, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 224 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "FreeType ©2020 The FreeType Project",
-			"itemType" : "Label",
-			"pos" : [ 16, 253 ],
-			"size" : [ 406, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 248 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Simple DirectMedia Layer ©1997-2020 Sam Lantinga",
-			"itemType" : "Label",
-			"pos" : [ 16, 277 ],
-			"size" : [ 406, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "License...",
-			"itemType" : "Button",
-			"pos" : [ 430, 272 ],
-			"size" : [ 66, 20 ],
-			"id" : 1,
-			"enabled" : true
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 438, 316 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Export Source Code to ZIP Archive...",
+			"itemType" : "Button",
+			"pos" : [ 205, 316 ],
+			"size" : [ 226, 20 ],
+			"id" : 1,
+			"enabled" : false
+		},
+		{
+			"name" : "Aerofoil ©2019-2024 Eric Lasota",
+			"itemType" : "Label",
+			"pos" : [ 16, 21 ],
+			"size" : [ 406, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 16 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Based on Glider PRO ©1994-2000 Casady & Greene, Inc., created by John Calhoun",
+			"itemType" : "Label",
+			"pos" : [ 16, 44 ],
+			"size" : [ 398, 28 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 44 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Open Sans font ©2011 Google",
+			"itemType" : "Label",
+			"pos" : [ 16, 77 ],
+			"size" : [ 406, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 72 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Roboto Mono font ©2015 Google",
+			"itemType" : "Label",
+			"pos" : [ 16, 101 ],
+			"size" : [ 406, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 96 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Gochi Hand font ©2011 Juan Pablo del Peral",
+			"itemType" : "Label",
+			"pos" : [ 16, 125 ],
+			"size" : [ 406, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 120 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Inter font ©2016-2019 Rasmus Andersson + Inter Project Authors",
+			"itemType" : "Label",
+			"pos" : [ 16, 149 ],
+			"size" : [ 406, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 144 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "LIBICONV ©1999-2001, 2016 Free Software Foundation, Inc.",
+			"itemType" : "Label",
+			"pos" : [ 16, 173 ],
+			"size" : [ 406, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 168 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "RapidJSON ©2015 THL A29 Limited, a Tencent company, and Milo Yip",
+			"itemType" : "Label",
+			"pos" : [ 16, 194 ],
+			"size" : [ 406, 28 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 196 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "zlib ©1995-2017 Jean-loup Gailly and Mark Adler",
+			"itemType" : "Label",
+			"pos" : [ 16, 229 ],
+			"size" : [ 406, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 224 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "FreeType ©2020 The FreeType Project",
+			"itemType" : "Label",
+			"pos" : [ 16, 253 ],
+			"size" : [ 406, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 248 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Simple DirectMedia Layer ©1997-2020 Sam Lantinga",
+			"itemType" : "Label",
+			"pos" : [ 16, 277 ],
+			"size" : [ 406, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "License...",
+			"itemType" : "Button",
+			"pos" : [ 430, 272 ],
+			"size" : [ 66, 20 ],
+			"id" : 1,
+			"enabled" : true
+		}
+	]
 }

ApplicationResourcePatches/DITL/2006.json

@@ -1,13 +1,13 @@
-{
-	"items" :
-	[
-		{
-			"name" : "Okay",
-			"itemType" : "Button",
-			"pos" : [ 454, 360 ],
-			"size" : [ 58, 20 ],
-			"id" : 1,
-			"enabled" : true
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 454, 360 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : true
+		}
+	]
 }

ApplicationResourcePatches/DITL/2007.json

@@ -1,53 +1,53 @@
-{
-	"items" :
-	[
-		{
-			"name" : "Okay",
-			"itemType" : "Button",
-			"pos" : [ 376, 176 ],
-			"size" : [ 58, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Cancel",
-			"itemType" : "Button",
-			"pos" : [ 302, 176 ],
-			"size" : [ 58, 20 ],
-			"id" : 2,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "CustomControl",
-			"pos" : [ 17, 33 ],
-			"size" : [ 401, 122 ],
-			"id" : 2,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "CustomControl",
-			"pos" : [ 418, 32 ],
-			"size" : [ 16, 124 ],
-			"id" : 3,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "EditBox",
-			"pos" : [ 16, 176 ],
-			"size" : [ 270, 16 ],
-			"id" : 4,
-			"enabled" : true
-		},
-		{
-			"name" : "^0",
-			"itemType" : "Label",
-			"pos" : [ 16, 16 ],
-			"size" : [ 418, 16 ],
-			"id" : 10,
-			"enabled" : true
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 376, 176 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Cancel",
+			"itemType" : "Button",
+			"pos" : [ 302, 176 ],
+			"size" : [ 58, 20 ],
+			"id" : 2,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "CustomControl",
+			"pos" : [ 17, 33 ],
+			"size" : [ 401, 122 ],
+			"id" : 2,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "CustomControl",
+			"pos" : [ 418, 32 ],
+			"size" : [ 16, 124 ],
+			"id" : 3,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "EditBox",
+			"pos" : [ 16, 176 ],
+			"size" : [ 270, 16 ],
+			"id" : 4,
+			"enabled" : true
+		},
+		{
+			"name" : "^0",
+			"itemType" : "Label",
+			"pos" : [ 16, 16 ],
+			"size" : [ 418, 16 ],
+			"id" : 10,
+			"enabled" : true
+		}
+	]
 }

ApplicationResourcePatches/DITL/2008.json

@@ -1,29 +1,29 @@
-{
-	"items" :
-	[
-		{
-			"name" : "No",
-			"itemType" : "Button",
-			"pos" : [ 253, 99 ],
-			"size" : [ 58, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Yes",
-			"itemType" : "Button",
-			"pos" : [ 184, 99 ],
-			"size" : [ 58, 20 ],
-			"id" : 2,
-			"enabled" : true
-		},
-		{
-			"name" : "Are you sure that you want to delete this file?",
-			"itemType" : "Label",
-			"pos" : [ 16, 16 ],
-			"size" : [ 295, 74 ],
-			"id" : 0,
-			"enabled" : false
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "No",
+			"itemType" : "Button",
+			"pos" : [ 253, 99 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Yes",
+			"itemType" : "Button",
+			"pos" : [ 184, 99 ],
+			"size" : [ 58, 20 ],
+			"id" : 2,
+			"enabled" : true
+		},
+		{
+			"name" : "Are you sure that you want to delete this file?",
+			"itemType" : "Label",
+			"pos" : [ 16, 16 ],
+			"size" : [ 295, 74 ],
+			"id" : 0,
+			"enabled" : false
+		}
+	]
 }

ApplicationResourcePatches/DITL/2009.json

@@ -1,61 +1,61 @@
-{
-	"items" :
-	[
-		{
-			"name" : "Okay",
-			"itemType" : "Button",
-			"pos" : [ 376, 240 ],
-			"size" : [ 58, 20 ],
-			"id" : 1,
-			"enabled" : true
-		},
-		{
-			"name" : "Cancel",
-			"itemType" : "Button",
-			"pos" : [ 302, 240 ],
-			"size" : [ 58, 20 ],
-			"id" : 2,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "CustomControl",
-			"pos" : [ 17, 33 ],
-			"size" : [ 401, 186 ],
-			"id" : 2,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "CustomControl",
-			"pos" : [ 418, 32 ],
-			"size" : [ 16, 188 ],
-			"id" : 3,
-			"enabled" : true
-		},
-		{
-			"name" : "",
-			"itemType" : "EditBox",
-			"pos" : [ 16, 240 ],
-			"size" : [ 196, 16 ],
-			"id" : 4,
-			"enabled" : true
-		},
-		{
-			"name" : "^0",
-			"itemType" : "Label",
-			"pos" : [ 16, 16 ],
-			"size" : [ 418, 16 ],
-			"id" : 10,
-			"enabled" : true
-		},
-		{
-			"name" : "Delete",
-			"itemType" : "Button",
-			"pos" : [ 228, 240 ],
-			"size" : [ 58, 20 ],
-			"id" : 2,
-			"enabled" : false
-		}
-	]
+{
+	"items" :
+	[
+		{
+			"name" : "Okay",
+			"itemType" : "Button",
+			"pos" : [ 376, 240 ],
+			"size" : [ 58, 20 ],
+			"id" : 1,
+			"enabled" : true
+		},
+		{
+			"name" : "Cancel",
+			"itemType" : "Button",
+			"pos" : [ 302, 240 ],
+			"size" : [ 58, 20 ],
+			"id" : 2,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "CustomControl",
+			"pos" : [ 17, 33 ],
+			"size" : [ 401, 186 ],
+			"id" : 2,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "CustomControl",
+			"pos" : [ 418, 32 ],
+			"size" : [ 16, 188 ],
+			"id" : 3,
+			"enabled" : true
+		},
+		{
+			"name" : "",
+			"itemType" : "EditBox",
+			"pos" : [ 16, 240 ],
+			"size" : [ 196, 16 ],
+			"id" : 4,
+			"enabled" : true
+		},
+		{
+			"name" : "^0",
+			"itemType" : "Label",
+			"pos" : [ 16, 16 ],
+			"size" : [ 418, 16 ],
+			"id" : 10,
+			"enabled" : true
+		},
+		{
+			"name" : "Delete",
+			"itemType" : "Button",
+			"pos" : [ 228, 240 ],
+			"size" : [ 58, 20 ],
+			"id" : 2,
+			"enabled" : false
+		}
+	]
 }

ApplicationResourcePatches/manifest.json

@@ -1,48 +1,48 @@
-{
-	"add" :
-	{
-		"DITL/1017.json" : "ApplicationResourcePatches/DITL/1017.json",
-		"DITL/1041.json" : "ApplicationResourcePatches/DITL/1041.json",
-		"DITL/2000.json" : "ApplicationResourcePatches/DITL/2000.json",
-		"DITL/2001.json" : "ApplicationResourcePatches/DITL/2001.json",
-		"DITL/2002.json" : "ApplicationResourcePatches/DITL/2002.json",
-		"DITL/2003.json" : "ApplicationResourcePatches/DITL/2003.json",
-		"DITL/2004.json" : "ApplicationResourcePatches/DITL/2004.json",
-		"DITL/2005.json" : "ApplicationResourcePatches/DITL/2005.json",
-		"DITL/2006.json" : "ApplicationResourcePatches/DITL/2006.json",
-		"DITL/2007.json" : "ApplicationResourcePatches/DITL/2007.json",
-		"DITL/2008.json" : "ApplicationResourcePatches/DITL/2008.json",
-		"DITL/2009.json" : "ApplicationResourcePatches/DITL/2009.json",
-		"PICT/1300.bmp" : "ApplicationResourcePatches/PICT/1300.bmp",
-		"PICT/1301.bmp" : "ApplicationResourcePatches/PICT/1301.bmp",
-		"PICT/1971.bmp" : "ApplicationResourcePatches/PICT/1971.bmp",
-		"PICT/1972.bmp" : "ApplicationResourcePatches/PICT/1972.bmp",
-		"PICT/1973.bmp" : "ApplicationResourcePatches/PICT/1973.bmp",
-		"PICT/1974.bmp" : "ApplicationResourcePatches/PICT/1974.bmp",
-		"PICT/1975.bmp" : "ApplicationResourcePatches/PICT/1975.bmp",
-		"PICT/1976.bmp" : "ApplicationResourcePatches/PICT/1976.bmp",
-		"PICT/1977.bmp" : "ApplicationResourcePatches/PICT/1977.bmp",
-		"PICT/1978.bmp" : "ApplicationResourcePatches/PICT/1978.bmp",
-		"PICT/1979.bmp" : "ApplicationResourcePatches/PICT/1979.bmp",
-		"PICT/1980.bmp" : "ApplicationResourcePatches/PICT/1980.bmp",
-		"PICT/1981.bmp" : "ApplicationResourcePatches/PICT/1981.bmp",
-		"PICT/1982.bmp" : "ApplicationResourcePatches/PICT/1982.bmp",
-		"PICT/1983.bmp" : "ApplicationResourcePatches/PICT/1983.bmp",
-		"PICT/1984.bmp" : "ApplicationResourcePatches/PICT/1984.bmp",
-		"PICT/1985.bmp" : "ApplicationResourcePatches/PICT/1985.bmp",
-		"PICT/1986.bmp" : "ApplicationResourcePatches/PICT/1986.bmp",
-		"PICT/1987.bmp" : "ApplicationResourcePatches/PICT/1987.bmp",
-		"LICS/1000.txt" : "ApplicationResourcePatches/LICS/1000.txt",
-		"LICS/1001.txt" : "ApplicationResourcePatches/LICS/1001.txt",
-		"LICS/1002.txt" : "ApplicationResourcePatches/LICS/1002.txt",
-		"LICS/1003.txt" : "ApplicationResourcePatches/LICS/1003.txt",
-		"LICS/1004.txt" : "ApplicationResourcePatches/LICS/1004.txt",
-		"LICS/1005.txt" : "ApplicationResourcePatches/LICS/1005.txt",
-		"LICS/1006.txt" : "ApplicationResourcePatches/LICS/1006.txt",
-		"STR$23/1006.txt" : "ApplicationResourcePatches/STR/1006.txt",
-		"snd$20/1063.wav" : "ApplicationResourcePatches/SND/1063.wav"
-	},
-	"delete" :
-	[
-	]
+{
+	"add" :
+	{
+		"DITL/1017.json" : "ApplicationResourcePatches/DITL/1017.json",
+		"DITL/1041.json" : "ApplicationResourcePatches/DITL/1041.json",
+		"DITL/2000.json" : "ApplicationResourcePatches/DITL/2000.json",
+		"DITL/2001.json" : "ApplicationResourcePatches/DITL/2001.json",
+		"DITL/2002.json" : "ApplicationResourcePatches/DITL/2002.json",
+		"DITL/2003.json" : "ApplicationResourcePatches/DITL/2003.json",
+		"DITL/2004.json" : "ApplicationResourcePatches/DITL/2004.json",
+		"DITL/2005.json" : "ApplicationResourcePatches/DITL/2005.json",
+		"DITL/2006.json" : "ApplicationResourcePatches/DITL/2006.json",
+		"DITL/2007.json" : "ApplicationResourcePatches/DITL/2007.json",
+		"DITL/2008.json" : "ApplicationResourcePatches/DITL/2008.json",
+		"DITL/2009.json" : "ApplicationResourcePatches/DITL/2009.json",
+		"PICT/1300.bmp" : "ApplicationResourcePatches/PICT/1300.bmp",
+		"PICT/1301.bmp" : "ApplicationResourcePatches/PICT/1301.bmp",
+		"PICT/1971.bmp" : "ApplicationResourcePatches/PICT/1971.bmp",
+		"PICT/1972.bmp" : "ApplicationResourcePatches/PICT/1972.bmp",
+		"PICT/1973.bmp" : "ApplicationResourcePatches/PICT/1973.bmp",
+		"PICT/1974.bmp" : "ApplicationResourcePatches/PICT/1974.bmp",
+		"PICT/1975.bmp" : "ApplicationResourcePatches/PICT/1975.bmp",
+		"PICT/1976.bmp" : "ApplicationResourcePatches/PICT/1976.bmp",
+		"PICT/1977.bmp" : "ApplicationResourcePatches/PICT/1977.bmp",
+		"PICT/1978.bmp" : "ApplicationResourcePatches/PICT/1978.bmp",
+		"PICT/1979.bmp" : "ApplicationResourcePatches/PICT/1979.bmp",
+		"PICT/1980.bmp" : "ApplicationResourcePatches/PICT/1980.bmp",
+		"PICT/1981.bmp" : "ApplicationResourcePatches/PICT/1981.bmp",
+		"PICT/1982.bmp" : "ApplicationResourcePatches/PICT/1982.bmp",
+		"PICT/1983.bmp" : "ApplicationResourcePatches/PICT/1983.bmp",
+		"PICT/1984.bmp" : "ApplicationResourcePatches/PICT/1984.bmp",
+		"PICT/1985.bmp" : "ApplicationResourcePatches/PICT/1985.bmp",
+		"PICT/1986.bmp" : "ApplicationResourcePatches/PICT/1986.bmp",
+		"PICT/1987.bmp" : "ApplicationResourcePatches/PICT/1987.bmp",
+		"LICS/1000.txt" : "ApplicationResourcePatches/LICS/1000.txt",
+		"LICS/1001.txt" : "ApplicationResourcePatches/LICS/1001.txt",
+		"LICS/1002.txt" : "ApplicationResourcePatches/LICS/1002.txt",
+		"LICS/1003.txt" : "ApplicationResourcePatches/LICS/1003.txt",
+		"LICS/1004.txt" : "ApplicationResourcePatches/LICS/1004.txt",
+		"LICS/1005.txt" : "ApplicationResourcePatches/LICS/1005.txt",
+		"LICS/1006.txt" : "ApplicationResourcePatches/LICS/1006.txt",
+		"STR$23/1006.txt" : "ApplicationResourcePatches/STR/1006.txt",
+		"snd$20/1063.wav" : "ApplicationResourcePatches/SND/1063.wav"
+	},
+	"delete" :
+	[
+	]
 }

CMakeLists.txt

@@ -5,6 +5,28 @@ 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(
+	$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=c++11-narrowing>
+	)
+
 find_package(SDL2 REQUIRED)
 
 if(PLATFORM STREQUAL "MAC")
@@ -127,18 +149,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 +175,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 +255,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 +281,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 +303,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"
@@ -296,4 +316,433 @@ if(CMAKE_HOST_UNIX)
 endif()
 
 
-install (TARGETS ${EXECNAME})
+add_executable(flattenmov EXCLUDE_FROM_ALL flattenmov/flattenmov.cpp AerofoilPortable/GpAllocator_C.cpp)
+target_include_directories(flattenmov PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	)
+target_link_libraries(flattenmov PortabilityLayer)
+
+add_executable(bin2gp EXCLUDE_FROM_ALL bin2gp/bin2gp.cpp AerofoilPortable/GpAllocator_C.cpp)
+target_include_directories(bin2gp PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	)
+target_link_libraries(bin2gp PortabilityLayer)
+
+add_executable(hqx2bin EXCLUDE_FROM_ALL hqx2bin/hqx2bin.cpp AerofoilPortable/GpAllocator_C.cpp)
+target_include_directories(hqx2bin PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	)
+target_link_libraries(hqx2bin PortabilityLayer)
+
+add_executable(hqx2gp EXCLUDE_FROM_ALL
+	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)
+
+add_executable(gpr2gpa EXCLUDE_FROM_ALL
+	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)
+
+add_executable(MakeTimestamp EXCLUDE_FROM_ALL
+	MakeTimestamp/MakeTimestamp.cpp
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
+target_include_directories(MakeTimestamp PRIVATE PortabilityLayer WindowsUnicodeToolShim)
+target_link_libraries(MakeTimestamp PortabilityLayer)
+
+add_executable(FTagData EXCLUDE_FROM_ALL
+	FTagData/FTagData.cpp
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
+target_include_directories(FTagData PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	AerofoilPortable
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(FTagData PortabilityLayer)
+
+add_executable(MergeGPF EXCLUDE_FROM_ALL
+	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)
+
+add_executable(MiniRez EXCLUDE_FROM_ALL MiniRez/MiniRez.cpp WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp)
+target_include_directories(MiniRez PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(MiniRez PortabilityLayer)
+
+add_executable(HouseTool EXCLUDE_FROM_ALL
+	HouseTool/HouseTool.cpp
+	WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
+	)
+target_include_directories(HouseTool PRIVATE
+	Common
+	GpCommon
+	PortabilityLayer
+	MacRomanConversion
+	WindowsUnicodeToolShim
+	)
+target_link_libraries(HouseTool PortabilityLayer MacRomanConversion)
+
+add_executable(unpacktool EXCLUDE_FROM_ALL
+	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)
+
+
+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)
+
+
+	add_executable(GenerateFonts EXCLUDE_FROM_ALL
+		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()
+
+add_executable(ConvertColorCursors EXCLUDE_FROM_ALL
+	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)
+
+
+add_custom_target(BuildDirs
+	BYPRODUCTS Packaged tmp
+	COMMAND "${CMAKE_COMMAND}" -E make_directory Packaged/Houses tmp
+	VERBATIM
+	)
+
+set(DATA_FILES)
+
+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 "" "" "")
+	set(TMPDIR "${CMAKE_CURRENT_BINARY_DIR}/tmp/${NAME}")
+	list(TRANSFORM ARG_UNPARSED_ARGUMENTS
+		REPLACE {TMPDIR} "${TMPDIR}"
+		)
+
+	add_custom_command(
+		OUTPUT "Packaged/${NAME}"
+		DEPENDS BuildDirs
+		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
+	DEPENDS
+		MiniRez gpr2gpa FTagData MergeGPF "GliderProData/Glider PRO.r"
+		ApplicationResourcePatches/manifest.json DefaultTimestamp.timestamp
+	COMMAND MiniRez
+		"GliderProData/Glider PRO.r"
+		"{TMPDIR}/ApplicationResources.gpr"
+	COMMAND gpr2gpa
+		"{TMPDIR}/ApplicationResources.gpr"
+		DefaultTimestamp.timestamp
+		"{TMPDIR}/ApplicationResources.gpa"
+		-patch ApplicationResourcePatches/manifest.json
+	COMMAND FTagData
+		DefaultTimestamp.timestamp
+		"{TMPDIR}/ApplicationResources.gpf"
+		data ozm5 0 0 locked
+	COMMAND MergeGPF
+		"{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
+	DEPENDS GenerateFonts MiniRez gpr2gpa FTagData MergeGPF ${FONT_DEPS}
+	COMMAND GenerateFonts "${CMAKE_SOURCE_DIR}/Resources" {TMPDIR}
+	COMMAND MiniRez "${CMAKE_SOURCE_DIR}/Empty.r" {TMPDIR}/Fonts.gpr
+	COMMAND gpr2gpa
+		{TMPDIR}/Fonts.gpr
+		"${CMAKE_SOURCE_DIR}/DefaultTimestamp.timestamp"
+		{TMPDIR}/Fonts.gpa
+		-patch {TMPDIR}/FontCacheManifest.json
+	COMMAND FTagData
+		DefaultTimestamp.timestamp
+		{TMPDIR}/Fonts.gpf
+		data ozm5 0 0 locked
+	COMMAND MergeGPF {TMPDIR}/Fonts.gpf
+	)
+
+# 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})
+
+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")
+	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 "${BINHEX_SRC}" "${TS}"
+		COMMAND hqx2gp
+			"${BINHEX_SRC}"
+			"${TS}"
+			"${BASE_PATH}"
+		COMMAND gpr2gpa
+			"${BASE_PATH}.gpr"
+			"${TS}"
+			"${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 BuildDirs "${MOV_GPA_SRC}" "${TS}"
+			COMMAND FTagData
+				"${TS}"
+				"${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(Executable DEPENDS "${EXECNAME}")
+
+add_custom_target(Resources ALL
+	DEPENDS
+		${DATA_FILES}
+		${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}/")
+
+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)
+
+if (UNIX AND NOT APPLE)
+	install(FILES Resources/Linux/io.github.elasota.aerofoil.metainfo.xml
+		DESTINATION share/appdata
+		PERMISSIONS WORLD_READ GROUP_READ GROUP_EXECUTE OWNER_READ OWNER_WRITE)
+	install(FILES Resources/Linux/io.github.elasota.aerofoil.desktop
+		DESTINATION share/applications
+		PERMISSIONS WORLD_EXECUTE WORLD_READ GROUP_READ GROUP_EXECUTE OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+	install(FILES Resources/Linux/io.github.elasota.aerofoil.svg
+		DESTINATION share/icons/hicolor/scalable/apps
+		PERMISSIONS WORLD_READ GROUP_READ GROUP_EXECUTE OWNER_READ OWNER_WRITE)
+endif()

CompileShadersD3D11/CompileShadersD3D11.vcxproj

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -20,13 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -38,9 +59,15 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -51,6 +78,14 @@
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -65,6 +100,20 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="CompileShadersD3D11.cpp" />
   </ItemGroup>

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);
 

ConvertColorCursors/ConvertColorCursors.vcxproj

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -20,13 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -43,6 +64,17 @@
     <Import Project="..\stb.props" />
     <Import Project="..\Debug.props" />
     <Import Project="..\AerofoilPortable.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\Common.props" />
+    <Import Project="..\stb.props" />
+    <Import Project="..\Debug.props" />
+    <Import Project="..\AerofoilPortable.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -52,6 +84,17 @@
     <Import Project="..\stb.props" />
     <Import Project="..\Release.props" />
     <Import Project="..\AerofoilPortable.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\Common.props" />
+    <Import Project="..\stb.props" />
+    <Import Project="..\Release.props" />
+    <Import Project="..\AerofoilPortable.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -63,6 +106,14 @@
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -77,10 +128,27 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="..\PortabilityLayer\PortabilityLayer.vcxproj">
       <Project>{6ec62b0f-9353-40a4-a510-3788f1368b33}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\WindowsUnicodeToolShim\WindowsUnicodeToolShim.vcxproj">
+      <Project>{15009625-1120-405e-8bba-69a16cd6713d}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\AerofoilPortable\GpAllocator_C.cpp" />

ConvertResources.bat

@@ -1,138 +1,138 @@
-rmdir /S /Q Packaged
-
-mkdir Packaged
-mkdir Packaged\Houses
-
-x64\Release\MiniRez.exe "GliderProData\Glider PRO.r" Packaged\ApplicationResources.gpr
-x64\Release\gpr2gpa.exe "Packaged\ApplicationResources.gpr" "DefaultTimestamp.timestamp" "Packaged\ApplicationResources.gpa" -patch "ApplicationResourcePatches\manifest.json"
-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\MiniRez.exe "Empty.r" Packaged\Fonts.gpr
-x64\Release\gpr2gpa.exe "Packaged\Fonts.gpr" "DefaultTimestamp.timestamp" "Packaged\Fonts.gpa" -patch "Packaged\FontCacheManifest.json"
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Fonts.gpf" data ozm5 0 0 locked
-x64\Release\MergeGPF.exe "Packaged\Fonts.gpf"
-
-del /Q Packaged\CachedFont*.bin
-del Packaged\FontCacheCatalog.bin
-del Packaged\FontCacheManifest.json
-del Packaged\Fonts.gpr
-del Packaged\Fonts.gpa
-
-x64\Release\ConvertColorCursors.exe
-
-attrib -R Packaged\ApplicationResources.gpf
-attrib -R Packaged\Houses\*
-
-x64\Release\hqx2gp.exe "GliderProData\Houses\Art Museum.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum"
-x64\Release\hqx2gp.exe "GliderProData\Houses\California or Bust!.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\California or Bust!"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Castle o' the Air.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air"
-x64\Release\hqx2gp.exe "GliderProData\Houses\CD Demo House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Davis Station.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Demo House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Fun House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Fun House"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Grand Prix.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix"
-x64\Release\hqx2gp.exe "GliderProData\Houses\ImagineHouse PRO II.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II"
-x64\Release\hqx2gp.exe "GliderProData\Houses\In The Mirror.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\In The Mirror"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Land of Illusion.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Leviathan.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Metropolis.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Metropolis"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Nemo's Market.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Rainbow's End.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Slumberland.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland"
-x64\Release\hqx2gp.exe "GliderProData\Houses\SpacePods.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Teddy World.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World"
-x64\Release\hqx2gp.exe "GliderProData\Houses\The Asylum Pro.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\The Asylum Pro"
-x64\Release\hqx2gp.exe "GliderProData\Houses\Titanic.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic"
-
-x64\Release\gpr2gpa.exe "Packaged\Houses\Art Museum.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\California or Bust!.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\California or Bust!.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Castle o' the Air.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\CD Demo House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Davis Station.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Demo House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Fun House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Fun House.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Grand Prix.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix.gpa" -patch "HousePatches\GrandPrix.json"
-x64\Release\gpr2gpa.exe "Packaged\Houses\ImagineHouse PRO II.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II.gpa" -patch "HousePatches\ImagineHousePROII.json"
-x64\Release\gpr2gpa.exe "Packaged\Houses\In The Mirror.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\In The Mirror.gpa" -patch "HousePatches\InTheMirror.json"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Land of Illusion.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Leviathan.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan.gpa" -patch "HousePatches\Leviathan.json"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Metropolis.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Metropolis.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Nemo's Market.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Rainbow's End.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End.gpa" -patch "HousePatches\RainbowsEnd.json"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Slumberland.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\SpacePods.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Teddy World.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\The Asylum Pro.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\The Asylum Pro.gpa"
-x64\Release\gpr2gpa.exe "Packaged\Houses\Titanic.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic.gpa"
-
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World.mov.gpf" MooV ozm5 0 0 locked
-x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic.mov.gpf" MooV ozm5 0 0 locked
-
-copy /Y GliderProData\ConvertedMovies\*.mov.gpa Packaged\Houses\
-
-rem Patch bad Castle 'o the Air start room
-x64\Release\HouseTool.exe patch "Packaged\Houses\Castle o' the Air.gpd" .firstRoom 77
-
-x64\Release\MergeGPF.exe "Packaged\Houses\Art Museum.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\California or Bust!.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Castle o' the Air.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\CD Demo House.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Davis Station.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Demo House.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Fun House.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Grand Prix.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\ImagineHouse PRO II.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\In The Mirror.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Land of Illusion.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Leviathan.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Metropolis.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Nemo's Market.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Rainbow's End.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Slumberland.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\SpacePods.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Teddy World.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\The Asylum Pro.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Titanic.gpf"
-
-x64\Release\MergeGPF.exe "Packaged\Houses\Art Museum.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Castle o' the Air.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\CD Demo House.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Davis Station.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Demo House.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Grand Prix.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\ImagineHouse PRO II.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Land of Illusion.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Leviathan.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Nemo's Market.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Rainbow's End.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Slumberland.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\SpacePods.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Teddy World.mov.gpf"
-x64\Release\MergeGPF.exe "Packaged\Houses\Titanic.mov.gpf"
-
-del /Q Packaged\Houses\*.gpr
-del /Q Packaged\Houses\*.gpa
-del /Q Packaged\Houses\*.gpd
-del /Q Packaged\ApplicationResources.gpr
-del /Q Packaged\ApplicationResources.gpa
-
-attrib +R Packaged\Houses\*
-attrib +R Packaged\ApplicationResources.gpf
-
-pause
+rmdir /S /Q Packaged
+
+mkdir Packaged
+mkdir Packaged\Houses
+
+x64\Release\MiniRez.exe "GliderProData\Glider PRO.r" Packaged\ApplicationResources.gpr
+x64\Release\gpr2gpa.exe "Packaged\ApplicationResources.gpr" "DefaultTimestamp.timestamp" "Packaged\ApplicationResources.gpa" -patch "ApplicationResourcePatches\manifest.json"
+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 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"
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Fonts.gpf" data ozm5 0 0 locked
+x64\Release\MergeGPF.exe "Packaged\Fonts.gpf"
+
+del /Q Packaged\CachedFont*.bin
+del Packaged\FontCacheCatalog.bin
+del Packaged\FontCacheManifest.json
+del Packaged\Fonts.gpr
+del Packaged\Fonts.gpa
+
+x64\Release\ConvertColorCursors.exe
+
+attrib -R Packaged\ApplicationResources.gpf
+attrib -R Packaged\Houses\*
+
+x64\Release\hqx2gp.exe "GliderProData\Houses\Art Museum.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum"
+x64\Release\hqx2gp.exe "GliderProData\Houses\California or Bust!.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\California or Bust!"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Castle o' the Air.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air"
+x64\Release\hqx2gp.exe "GliderProData\Houses\CD Demo House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Davis Station.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Demo House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Fun House.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Fun House"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Grand Prix.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix"
+x64\Release\hqx2gp.exe "GliderProData\Houses\ImagineHouse PRO II.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II"
+x64\Release\hqx2gp.exe "GliderProData\Houses\In The Mirror.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\In The Mirror"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Land of Illusion.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Leviathan.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Metropolis.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Metropolis"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Nemo's Market.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Rainbow's End.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Slumberland.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland"
+x64\Release\hqx2gp.exe "GliderProData\Houses\SpacePods.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Teddy World.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World"
+x64\Release\hqx2gp.exe "GliderProData\Houses\The Asylum Pro.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\The Asylum Pro"
+x64\Release\hqx2gp.exe "GliderProData\Houses\Titanic.binhex" "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic"
+
+x64\Release\gpr2gpa.exe "Packaged\Houses\Art Museum.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\California or Bust!.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\California or Bust!.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Castle o' the Air.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\CD Demo House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Davis Station.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Demo House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Fun House.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Fun House.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Grand Prix.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix.gpa" -patch "HousePatches\GrandPrix.json"
+x64\Release\gpr2gpa.exe "Packaged\Houses\ImagineHouse PRO II.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II.gpa" -patch "HousePatches\ImagineHousePROII.json"
+x64\Release\gpr2gpa.exe "Packaged\Houses\In The Mirror.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\In The Mirror.gpa" -patch "HousePatches\InTheMirror.json"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Land of Illusion.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Leviathan.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan.gpa" -patch "HousePatches\Leviathan.json"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Metropolis.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Metropolis.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Nemo's Market.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Rainbow's End.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End.gpa" -patch "HousePatches\RainbowsEnd.json"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Slumberland.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\SpacePods.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Teddy World.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\The Asylum Pro.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\The Asylum Pro.gpa"
+x64\Release\gpr2gpa.exe "Packaged\Houses\Titanic.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic.gpa"
+
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World.mov.gpf" MooV ozm5 0 0 locked
+x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic.mov.gpf" MooV ozm5 0 0 locked
+
+copy /Y GliderProData\ConvertedMovies\*.mov.gpa Packaged\Houses\
+
+rem Patch bad Castle 'o the Air start room
+x64\Release\HouseTool.exe patch "Packaged\Houses\Castle o' the Air.gpd" .firstRoom 77
+
+x64\Release\MergeGPF.exe "Packaged\Houses\Art Museum.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\California or Bust!.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Castle o' the Air.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\CD Demo House.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Davis Station.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Demo House.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Fun House.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Grand Prix.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\ImagineHouse PRO II.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\In The Mirror.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Land of Illusion.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Leviathan.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Metropolis.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Nemo's Market.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Rainbow's End.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Slumberland.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\SpacePods.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Teddy World.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\The Asylum Pro.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Titanic.gpf"
+
+x64\Release\MergeGPF.exe "Packaged\Houses\Art Museum.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Castle o' the Air.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\CD Demo House.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Davis Station.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Demo House.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Grand Prix.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\ImagineHouse PRO II.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Land of Illusion.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Leviathan.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Nemo's Market.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Rainbow's End.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Slumberland.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\SpacePods.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Teddy World.mov.gpf"
+x64\Release\MergeGPF.exe "Packaged\Houses\Titanic.mov.gpf"
+
+del /Q Packaged\Houses\*.gpr
+del /Q Packaged\Houses\*.gpa
+del /Q Packaged\Houses\*.gpd
+del /Q Packaged\ApplicationResources.gpr
+del /Q Packaged\ApplicationResources.gpa
+
+attrib +R Packaged\Houses\*
+attrib +R Packaged\ApplicationResources.gpf
+
+pause

Documentation/leveleditor.txt

@@ -1,55 +1,55 @@
-CREATING CUSTOM RESOURCES FOR YOUR HOUSES
-------------------------------------------------------------------------------
-When editing a house, you can create custom resources for it by creating a ZIP
-archive with the name of the house .gpf and .gpd files and giving it a .gpa
-extension.  This is referred to as a "resource archive."
-
-Within a resource archive, you can place resources in a subfolder named after
-the resource type, and resource files within the subfolder with a specified
-ID.
-
-Supported resource types and their corresponding folder names:
-"icl4":   32x32 4-bit-per-pixel icon graphics in BMP format.
-"icl8":   32x32 8-bit-per-pixel icon graphics in BMP format.
-"ICN$23": 32x64 black and white icon graphics and masks.  The top half of the
-          image is the image, and bottom half is the mask.  The mask should
-		  be white for transparent pixels and black for opaque pixels.
-"ics4":   16x16 4-bit-per-pixel icon graphics in BMP format.
-"ics8":   16x16 8-bit-per-pixel icon graphics in BMP format.
-"ics$23": 16x32 black and white icon graphics and masks.  The top half of the
-          image is the image, and bottom half is the mask.  The mask should
-		  be white for transparent pixels and black for opaque pixels.
-"PICT":   BMP format images.
-"snd$20": Sounds in 8-bit mono unsigned 22254Hz WAV format.
-
-
-For example, to create a custom image with the resource ID 1200, create a BMP
-format image named "1200.bmp" and place it in the "PICT" directory inside of
-the resource archive.
-
-IDs can range from -32768 to 32767.
-
-To create a custom icon, create an "icl8" or "ICN$23" resource with the ID
--16455.
-
-
-PACKAGING YOUR HOUSE FOR DISTRIBUTION
--------------------------------------------------------------------------------
-To package a house for single-file distribution, use the "MergeGPF" tool to
-combine the metadata, house data, and resources into a single GPF file.  Doing
-this will make your house read-only, so make a copy first!
-
-If you accidentally make your house read-only by doing this, then you can
-return it to an editable state via the following steps:
-- Open the GPF file using a ZIP archive tool.
-- Extract the "!data" file from the GPF and change it to the name of the house
-  with a ".gpd" extension.
-- If the house has any custom resources, then duplicate the GPF file and rename
-  it to the house name with a ".gpa" extension, then open it with a ZIP archive
-  tool and remove the "!!meta" and "!data" files from the ".gpa" archive.
-- Remove the "!data" file and any custom resources from the GPF file.
-
-Alternately, you can export a house to play with the original Glider PRO by
-using the "Export Glider PRO House..." option in the Import/Export menu.  Doing
-this will output a MacBinary file to the "Export" subdirectory of the "Aerofoil"
+CREATING CUSTOM RESOURCES FOR YOUR HOUSES
+------------------------------------------------------------------------------
+When editing a house, you can create custom resources for it by creating a ZIP
+archive with the name of the house .gpf and .gpd files and giving it a .gpa
+extension.  This is referred to as a "resource archive."
+
+Within a resource archive, you can place resources in a subfolder named after
+the resource type, and resource files within the subfolder with a specified
+ID.
+
+Supported resource types and their corresponding folder names:
+"icl4":   32x32 4-bit-per-pixel icon graphics in BMP format.
+"icl8":   32x32 8-bit-per-pixel icon graphics in BMP format.
+"ICN$23": 32x64 black and white icon graphics and masks.  The top half of the
+          image is the image, and bottom half is the mask.  The mask should
+		  be white for transparent pixels and black for opaque pixels.
+"ics4":   16x16 4-bit-per-pixel icon graphics in BMP format.
+"ics8":   16x16 8-bit-per-pixel icon graphics in BMP format.
+"ics$23": 16x32 black and white icon graphics and masks.  The top half of the
+          image is the image, and bottom half is the mask.  The mask should
+		  be white for transparent pixels and black for opaque pixels.
+"PICT":   BMP format images.
+"snd$20": Sounds in 8-bit mono unsigned 22254Hz WAV format.
+
+
+For example, to create a custom image with the resource ID 1200, create a BMP
+format image named "1200.bmp" and place it in the "PICT" directory inside of
+the resource archive.
+
+IDs can range from -32768 to 32767.
+
+To create a custom icon, create an "icl8" or "ICN$23" resource with the ID
+-16455.
+
+
+PACKAGING YOUR HOUSE FOR DISTRIBUTION
+-------------------------------------------------------------------------------
+To package a house for single-file distribution, use the "MergeGPF" tool to
+combine the metadata, house data, and resources into a single GPF file.  Doing
+this will make your house read-only, so make a copy first!
+
+If you accidentally make your house read-only by doing this, then you can
+return it to an editable state via the following steps:
+- Open the GPF file using a ZIP archive tool.
+- Extract the "!data" file from the GPF and change it to the name of the house
+  with a ".gpd" extension.
+- If the house has any custom resources, then duplicate the GPF file and rename
+  it to the house name with a ".gpa" extension, then open it with a ZIP archive
+  tool and remove the "!!meta" and "!data" files from the ".gpa" archive.
+- Remove the "!data" file and any custom resources from the GPF file.
+
+Alternately, you can export a house to play with the original Glider PRO by
+using the "Export Glider PRO House..." option in the Import/Export menu.  Doing
+this will output a MacBinary file to the "Export" subdirectory of the "Aerofoil"
 directory in your Documents directory.

Documentation/license_apache.txt

@@ -1,202 +1,202 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Documentation/license_ofl.txt

@@ -1,94 +1,94 @@
-Copyright (c) 2011, Juan Pablo del Peral (juan@huertatipografica.com.ar),
-with Reserved Font Names "Gochi" and "Gochi Hand"
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright (c) 2011, Juan Pablo del Peral (juan@huertatipografica.com.ar),
+with Reserved Font Names "Gochi" and "Gochi Hand"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

Documentation/picterrors.txt

@@ -1,28 +1,28 @@
-Many Glider PRO houses, including the bundled ones, contain images in QuickDraw
-PICT format in the game resource data.
-
-PICT is a very complex format, many of its features are not completely
-documented, and some PICT features are impossible to support because they
-require copyrighted pattern sets and fonts that are bundled with the
-operating system.
-
-My goal is to support as many community houses as possible, but there is a
-point where supporting the format is more work than just manually converting
-the resources on a Macintosh machine or emulator.
-
-All of the remaining known unsupported features necessary to decode the
-remaining cases are only used by one house that I'm aware of each.
-
-Known error codes:
-
-Code 5 subcode 25: Strange image channel layout
-Code 8 subcode 145: Unsupported BitsRgn opcode.
-Code 8 subcode 40960: Undocumented opcode, possibly a format parsing error.
-
-Code 8 subcode 34: Unsupported ShortLine opcode. (PICT contains vector graphics.)
-Code 8 subcode 35: Unsupported ShortLineFrom opcode. (PICT contains vector graphics.)
-Code 8 subcode 49: Unsupported PaintRect opcode. (PICT contains vector graphics.)
-Code 8 subcode 51: Unsupported PaintOval opcode. (PICT contains vector graphics.)
-Code 8 subcode 129: paintRgn opcode. (PICT contains vector graphics.)
-Code 8 subcode 33280: Unsupported CompressedQuickTime opcode.  (PICT contains a QuickTime frame.)
-Code 8 subcode 33281: Unsupported UncompressedQuickTime opcode.  (PICT contains a QuickTime frame.)
+Many Glider PRO houses, including the bundled ones, contain images in QuickDraw
+PICT format in the game resource data.
+
+PICT is a very complex format, many of its features are not completely
+documented, and some PICT features are impossible to support because they
+require copyrighted pattern sets and fonts that are bundled with the
+operating system.
+
+My goal is to support as many community houses as possible, but there is a
+point where supporting the format is more work than just manually converting
+the resources on a Macintosh machine or emulator.
+
+All of the remaining known unsupported features necessary to decode the
+remaining cases are only used by one house that I'm aware of each.
+
+Known error codes:
+
+Code 5 subcode 25: Strange image channel layout
+Code 8 subcode 145: Unsupported BitsRgn opcode.
+Code 8 subcode 40960: Undocumented opcode, possibly a format parsing error.
+
+Code 8 subcode 34: Unsupported ShortLine opcode. (PICT contains vector graphics.)
+Code 8 subcode 35: Unsupported ShortLineFrom opcode. (PICT contains vector graphics.)
+Code 8 subcode 49: Unsupported PaintRect opcode. (PICT contains vector graphics.)
+Code 8 subcode 51: Unsupported PaintOval opcode. (PICT contains vector graphics.)
+Code 8 subcode 129: paintRgn opcode. (PICT contains vector graphics.)
+Code 8 subcode 33280: Unsupported CompressedQuickTime opcode.  (PICT contains a QuickTime frame.)
+Code 8 subcode 33281: Unsupported UncompressedQuickTime opcode.  (PICT contains a QuickTime frame.)

Documentation/readme.txt

@@ -1,150 +1,150 @@
-Thank you for trying Aerofoil!
-
-IMPORTANT: Aerofoil is not maintained by, supported by, endorsed by, or
-otherwise associated with the authors and publishers of Glider PRO.
-Please do not contact any of them regarding issues related to Aerofoil.
-
-If you have an issue with Aerofoil, please post an issue to the Aerofoil
-issue tracker on GitHub:
-https://github.com/elasota/Aerofoil/issues
-
-
-IN-GAME SHORTCUT COMMANDS
--------------------------------------------------------------------------------
-- Ctrl-S saves the game.  You can reload a saved game from the main menu.
-- Ctrl-Q quits the game.
-- Alt-Enter toggles full screen.
-
-
-GAMEPAD SUPPORT (WINDOWS)
--------------------------------------------------------------------------------
-XInput gamepads are supported.  Other gamepads may be supported via third-party
-software that maps them to XInput (i.e. PS4 gamepads are supported via
-DS4Windows)
-
-
-LEGAL NOTICES
--------------------------------------------------------------------------------
-Aerofoil is (c)2019-2020 Eric Lasota
-Based on Glider PRO (c)1994-2000 Casady & Greene, Inc., written by John Calhoun
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-A copy of the license is included in the accompanying license_gplv2.txt file.
-
-
-ADDITIONAL CREDITS
--------------------------------------------------------------------------------
-* Demo House and CD Demo House are by John Calhoun and Kim Money.
-* Davis Station, Metropolis and Titanic are by Jonathan Chin (alias Paul Finn)
-  and John Calhoun.
-* Grand Prix, Leviathan, ImagineHouse PRO II and In The Mirror are by Jonathan
-  Chin (alias Paul Finn).
-* Land of Illusion, Nemo's Market, Rainbow's End and SpacePods are by Ward
-  Hartenstein.
-* Slumberland is by John Calhoun (first house and top of fourth house)
-  Jonathan Chin (second house), Steve Sullivan (third house) and Ward
-  Hartenstein (bottom of fourth house).
-* Teddy World is by Shawn Brenneman.
-* The Asylum Pro is by Steve Sullivan.
-* PICT resource 3975 (Ozma) is derived from an illustration by John R. Neill
-  from [Ozma of Oz](https://www.gutenberg.org/files/33361/33361-h/33361-h.htm).
-* PICT resource 153 (About box) features a portion of
-  [this Little Nemo comic](http://www.comicstriplibrary.org/display/116)
-  byWinsor McCay.
-
-
-Aerofoil uses the following third-party software:
-
-Open Sans font:
-(c)2011 Google
-Distributed under the Apache License (see license_apache.txt)
-
-
-Roboto Mono font:
-(c)2015 Google
-Distributed under the Apache License (see license_apache.txt)
-
-
-Gochi Hand font:
-(c) 2011 Juan Pablo del Peral
-Distributed under the Open Font License (see license_ofl.txt)
-
-
-stb_image_write:
-Created by Sean Barrett
-
-
-LIBICONV:
-Copyright (C) 1999-2001, 2016 Free Software Foundation, Inc.
-
-Distributed under the LGPLv2 license (See license_lgplv2.txt)
-
-
-RapidJSON:
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All
-rights reserved.
-
-Distributed under the MIT license (See license_rapidjson.txt)
-
-
-zlib:
-
- (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-FreeType:
-
-Portions of this software are copyright (c)2020 The FreeType Project
-(www.freetype.org).
-All rights reserved.
-
-Distributed under the GPLv2 license (see license_gplv2.txt)
-
-
-The Unarchiver:
-
-The "unpacktool" utility is heavily based on code from The Unarchiver.
-Copyright (C) 2006-2013 Dag Ågren
-
-Distributed under the LGPLv2 license (See license_lgplv2.txt)
-
-
-FFmpeg:
-
-The "gpr2gpa" tool uses MACE decompression code from FFmpeg.
-Copyright (c) 2002 Laszlo Torok <torokl@alpha.dfmk.hu>
-
-Distributed under the LGPLv2 license (See license_lgplv2.txt)
+Thank you for trying Aerofoil!
+
+IMPORTANT: Aerofoil is not maintained by, supported by, endorsed by, or
+otherwise associated with the authors and publishers of Glider PRO.
+Please do not contact any of them regarding issues related to Aerofoil.
+
+If you have an issue with Aerofoil, please post an issue to the Aerofoil
+issue tracker on GitHub:
+https://github.com/elasota/Aerofoil/issues
+
+
+IN-GAME SHORTCUT COMMANDS
+-------------------------------------------------------------------------------
+- Ctrl-S saves the game.  You can reload a saved game from the main menu.
+- Ctrl-Q quits the game.
+- Alt-Enter toggles full screen.
+
+
+GAMEPAD SUPPORT (WINDOWS)
+-------------------------------------------------------------------------------
+XInput gamepads are supported.  Other gamepads may be supported via third-party
+software that maps them to XInput (i.e. PS4 gamepads are supported via
+DS4Windows)
+
+
+LEGAL NOTICES
+-------------------------------------------------------------------------------
+Aerofoil is (c)2019-2020 Eric Lasota
+Based on Glider PRO (c)1994-2000 Casady & Greene, Inc., written by John Calhoun
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+A copy of the license is included in the accompanying license_gplv2.txt file.
+
+
+ADDITIONAL CREDITS
+-------------------------------------------------------------------------------
+* Demo House and CD Demo House are by John Calhoun and Kim Money.
+* Davis Station, Metropolis and Titanic are by Jonathan Chin (alias Paul Finn)
+  and John Calhoun.
+* Grand Prix, Leviathan, ImagineHouse PRO II and In The Mirror are by Jonathan
+  Chin (alias Paul Finn).
+* Land of Illusion, Nemo's Market, Rainbow's End and SpacePods are by Ward
+  Hartenstein.
+* Slumberland is by John Calhoun (first house and top of fourth house)
+  Jonathan Chin (second house), Steve Sullivan (third house) and Ward
+  Hartenstein (bottom of fourth house).
+* Teddy World is by Shawn Brenneman.
+* The Asylum Pro is by Steve Sullivan.
+* PICT resource 3975 (Ozma) is derived from an illustration by John R. Neill
+  from [Ozma of Oz](https://www.gutenberg.org/files/33361/33361-h/33361-h.htm).
+* PICT resource 153 (About box) features a portion of
+  [this Little Nemo comic](http://www.comicstriplibrary.org/display/116)
+  byWinsor McCay.
+
+
+Aerofoil uses the following third-party software:
+
+Open Sans font:
+(c)2011 Google
+Distributed under the Apache License (see license_apache.txt)
+
+
+Roboto Mono font:
+(c)2015 Google
+Distributed under the Apache License (see license_apache.txt)
+
+
+Gochi Hand font:
+(c) 2011 Juan Pablo del Peral
+Distributed under the Open Font License (see license_ofl.txt)
+
+
+stb_image_write:
+Created by Sean Barrett
+
+
+LIBICONV:
+Copyright (C) 1999-2001, 2016 Free Software Foundation, Inc.
+
+Distributed under the LGPLv2 license (See license_lgplv2.txt)
+
+
+RapidJSON:
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All
+rights reserved.
+
+Distributed under the MIT license (See license_rapidjson.txt)
+
+
+zlib:
+
+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+FreeType:
+
+Portions of this software are copyright (c)2020 The FreeType Project
+(www.freetype.org).
+All rights reserved.
+
+Distributed under the GPLv2 license (see license_gplv2.txt)
+
+
+The Unarchiver:
+
+The "unpacktool" utility is heavily based on code from The Unarchiver.
+Copyright (C) 2006-2013 Dag Ågren
+
+Distributed under the LGPLv2 license (See license_lgplv2.txt)
+
+
+FFmpeg:
+
+The "gpr2gpa" tool uses MACE decompression code from FFmpeg.
+Copyright (c) 2002 Laszlo Torok <torokl@alpha.dfmk.hu>
+
+Distributed under the LGPLv2 license (See license_lgplv2.txt)

Documentation/userhouses.txt

@@ -1,95 +1,115 @@
-ADDING A THIRD-PARTY HOUSE TO AEROFOIL
--------------------------------------------------------------------------------
-To add a third-party house to Aerofoil, copy the house .gpf file, and .gpd/.gpa
-files, if necessary, to the "Houses" directory inside of the "Aerofoil"
-directory in your "Documents" directory, then restart Aerofoil.
-
-
-
-
-IMPORTING EXISTING COMMUNITY CONTENT TO AEROFOIL
--------------------------------------------------------------------------------
-If you want to import an existing third-party Glider PRO house to Aerofoil,
-a few steps are required.
-
-You need to convert the file into Aerofoil's "triplet" format, which consists
-of a metadata file (extension .gpf), and file forks (.gpd for data, .gpr for
-resources).  How you get these depends on the input format:
-- For MacBinary files (.bin), use the "bin2gp" utility
-- For BinHex files (.hqx), use the "hqx2gp" utility
-- For StuffIt (.sit) and Compact Pro (.cpt) archives, use the "unpacktool"
-  utility to extract the contents in triplet format.  The "unpacktool"
-  utility should support most vintage StuffIt archives made with StuffIt
-  Deluxe 6 or lower.
-
-(NOTE: ".sea" files are self-extracting archives, typically StuffIt or Compact
-Pro archives with the self-extractor program in the resources.  These will
-always be distributed in a fork-grouping container like MacBinary or BinHex.
-For cases like these, you need to split the self-extracting archive using
-"bin2gp" or "hqx2gp" and then pass the ".sea.gpd" file (which contains the
-archive data) to "unpacktool" to decompress it.)
-
-Once you've done that, if the house has custom resources (i.e. a .gpr file),
-you need to convert it to an Aerofoil resource archive, which you can do using
-the "gpr2gpa" tool.
-
-gpr2gpa's PICT converter may not support all PICT encodings.  If you find a
-house with custom PICT resources that isn't supported, please submit a sample
-to Aerofoil's issue tracker.
-
-
-IMPORTING TV QUICKTIME MOVIES
--------------------------------------------------------------------------------
-Converting QuickTime movies for displaying on in-game TVs is a bit more complex.
-First, you need to convert the movie to a sequence of BMP images, which you
-can do with third-party tools such as FFMPEG.  Second, you need to create a
-JSON file containing the movie metadata, which looks like this, for example:
-
-{
-	"frameRateNumerator" : 8,
-	"frameRateDenominator" : 1
-}
-
-Once you've done that, create a ZIP archive where the path of the JSON file is
-"muvi\0.json" and the frames are "PICT\<frame number>.bmp", where <frame
-number> is the frame number, starting with 1 as the first frame, and name that
-the same as the house name, but with a ".mov.gpa" extension.
-
-Next, you need to create a metadata file for the movie, which should have a
-".mov.gpf" extension.  You can create the metadata file using the "FTagData"
-utility, using a timestamp file created with the "MakeTimestamp" utility.
-I'd recommend using "MooV" as the file type and "ozm5" as the file creator.
-
-You do NOT need to keep the .mov.gpd file once you've done this - Aerofoil
-expects all of the movie data to be in the resource archive.
-
-
-Some old QuickTime movies contain movie tracking information in the movie
-resource fork, in which case you need to merge them into the data for modern
-utilities to read them.  You can use the "flattenmov" tool to do this: Pass
-it the data (.gpd) and resource (.gpr) data files for a movie, and it will
-merge them into a single .mov file.
-
-
-BATCH CONVERSION
-------------------------------------------------------------------------------
-To batch-convert house resource files, use gpr2gpa with a path that ends
-with an asterisk (*) and omit the output filename.
-
-
-SECURITY CONSIDERATIONS
-------------------------------------------------------------------------------
-Glider PRO didn't really do any validation of houses.  Currently, Aerofoil
-doesn't do any additional validation either, and it's possible that invalid
-house data may lead to crashes or even remote code execution.
-
-Aerofoil 1.1 has a significantly stricter validator, which will reject data
-that seems excessively large or invalid.
-
-Also, Glider PRO houses were able to take advantage of a resource overlaying
-feature of the Macintosh operating system, where a resource being present in
-the house file with the same ID as an application resource would cause the
-resource to override the application resource.
-
-Aerofoil's resource loader is much more restrictive: Currently, only
-backgrounds, audio triggers, and icons may load from the house data.
+ADDING A THIRD-PARTY HOUSE TO AEROFOIL
+-------------------------------------------------------------------------------
+To add a third-party house to Aerofoil, copy the house .gpf file, and .gpd/.gpa
+files, if necessary, to the "Houses" directory inside of the "Aerofoil"
+directory in your "Documents" directory, then restart Aerofoil.
+
+
+IMPORTING EXISTING COMMUNITY CONTENT TO AEROFOIL
+-------------------------------------------------------------------------------
+If you want to import an existing third-party Glider PRO house to Aerofoil,
+a few steps are required.  All Aerofoil import tools are currently command-line
+only, so you will need to use a command prompt to use them.  Launch the tool
+programs without any arguments and they will give instructions for usage.
+
+
+Some history: On most modern operating systems, files are a single stream of
+data, and the file type is represented by an extension at the end of the file
+name.  On classic Macintosh systems, files have 2 streams: The data fork and
+resource fork, and the file type (among other things) is stored in a metadata
+block that is separate from the file data itself.
+
+Macintosh Glider PRO house files use the data fork to store the level data and
+the resource fork to store custom features like sounds.
+
+However, most server software only supports transmitting files as a single data
+stream, so Macintosh files were shared in formats that bundle the 3 types of
+data into a single data stream, and were converted into the full Macintosh
+format files using conversion software on a Macintosh machine.
+
+Aerofoil's unpack tools will always extract Macintosh files as a triplet of 3
+files:
+- The resource fork will be split to a file with a ".gpr" extension
+- The data fork will be split to a file with a ".gpa" extension
+- The metadata will be split to a file with a ".gpf" extension
+
+Some file types you may encounter in the wild:
+- MacBinary files (.bin): These encode a single file.  Use the "bin2gp"
+  utility to unpack it.
+- BinHex files (.hqx): These encode a single file.  Use the "hqx2gp" utility
+  to unpack it.
+- Compact Pro (.cpt) and StuffIt (.sit) archives encode multiple files.
+  Use the "unpacktool" utility to extract it.
+- Self-extracting archives (.sea) are programs that contain archive data,
+  usually in StuffIt or Compact Pro format, in the data fork, and a
+  decompression program in the resource fork.  Typically you will encounter
+  these as ".sea.hqx" or similar.  For these, you need to extract the .sea
+  file from its original encoding, and then pass the data fork file (.gpd)
+  to the "unpacktool" utility.
+
+
+Once you've unpacked the data for the house, you may need to convert the
+resources (.gpr file) to Aerofoil's resource format.  Aerofoil can not read .gpr
+files directly.
+
+To convert resources for a house, use the "gpr2gpa" utility.  Note that
+gpr2gpa's PICT converter may not support all PICT encodings.  If you find a
+house with custom PICT resources that isn't supported, please submit a sample
+to Aerofoil's issue tracker.
+
+Once you've done this, you should have a .gpf, .gpa, and .gpd file for the
+house.  Put them in the Houses directory to add the house to Aerofoil.
+
+
+IMPORTING TV QUICKTIME MOVIES
+-------------------------------------------------------------------------------
+Converting QuickTime movies for displaying on in-game TVs is a bit more complex.
+First, you need to convert the movie to a sequence of BMP images, which you
+can do with third-party tools such as FFMPEG.  Second, you need to create a
+JSON file containing the movie metadata, which looks like this, for example:
+
+{
+	"frameRateNumerator" : 8,
+	"frameRateDenominator" : 1
+}
+
+Once you've done that, create a ZIP archive where the path of the JSON file is
+"muvi\0.json" and the frames are "PICT\<frame number>.bmp", where <frame
+number> is the frame number, starting with 1 as the first frame, and name that
+the same as the house name, but with a ".mov.gpa" extension.
+
+Next, you need to create a metadata file for the movie, which should have a
+".mov.gpf" extension.  You can create the metadata file using the "FTagData"
+utility, using a timestamp file created with the "MakeTimestamp" utility.
+I'd recommend using "MooV" as the file type and "ozm5" as the file creator.
+
+You do NOT need to keep the .mov.gpd file once you've done this - Aerofoil
+expects all of the movie data to be in the resource archive.
+
+
+Some old QuickTime movies contain movie tracking information in the movie
+resource fork, in which case you need to merge them into the data for modern
+utilities to read them.  You can use the "flattenmov" tool to do this: Pass
+it the data (.gpd) and resource (.gpr) data files for a movie, and it will
+merge them into a single .mov file.
+
+
+BATCH CONVERSION
+------------------------------------------------------------------------------
+To batch-convert house resource files, use gpr2gpa with a path that ends
+with an asterisk (*) and omit the output filename.
+
+
+SECURITY CONSIDERATIONS
+------------------------------------------------------------------------------
+Glider PRO didn't really do any validation of houses.  Aerofoil 1.1 has a
+significantly stricter validator, which will reject data that seems
+excessively large or invalid.
+
+Also, Glider PRO houses were able to take advantage of a resource overlaying
+feature of the Macintosh operating system, where a resource being present in
+the house file with the same ID as an application resource would cause the
+resource to override the application resource.
+
+Aerofoil's resource loader is much more restrictive: Currently, only
+backgrounds, audio triggers, and icons may load from the house data.

EmitWiXVersion/EmitWiXVersion.vcxproj

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -20,13 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -40,11 +61,21 @@
     <Import Project="..\GpCommon.props" />
     <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\GpCommon.props" />
     <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -55,6 +86,14 @@
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -69,6 +108,20 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="EmitWiXVersion.cpp" />
   </ItemGroup>

FTagData/FTagData.cpp

@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <string>
-#include <Windows.h>
+
 #include "MacFileInfo.h"
 #include "CFileStream.h"
 #include "CombinedTimestamp.h"

FTagData/FTagData.vcxproj

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -20,13 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -43,6 +64,14 @@
     <Import Project="..\Debug.props" />
     <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Common.props" />
+    <Import Project="..\Debug.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\PortabilityLayer.props" />
@@ -51,6 +80,14 @@
     <Import Project="..\Release.props" />
     <Import Project="..\WindowsUnicodeToolShim.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\PortabilityLayer.props" />
+    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Common.props" />
+    <Import Project="..\Release.props" />
+    <Import Project="..\WindowsUnicodeToolShim.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -61,6 +98,14 @@
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -75,6 +120,20 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="..\PortabilityLayer\PortabilityLayer.vcxproj">
       <Project>{6ec62b0f-9353-40a4-a510-3788f1368b33}</Project>

FreeType/FreeType.vcxproj

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -49,13 +57,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -69,11 +90,21 @@
     <Import Project="..\FreeTypePublic.props" />
     <Import Project="FreeTypePrivate.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\FreeTypePublic.props" />
+    <Import Project="FreeTypePrivate.props" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\FreeTypePublic.props" />
     <Import Project="FreeTypePrivate.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\FreeTypePublic.props" />
+    <Import Project="FreeTypePrivate.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -84,6 +115,14 @@
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -98,6 +137,20 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

FreeType/freetype/Makefile

@@ -1,34 +1,34 @@
-#
-# FreeType 2 build system -- top-level Makefile
-#
-
-
-# Copyright (C) 1996-2019 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-
-# Project names
-#
-PROJECT       := freetype
-PROJECT_TITLE := FreeType
-
-# The variable TOP_DIR holds the path to the topmost directory in the project
-# engine source hierarchy.  If it is not defined, default it to `.'.
-#
-TOP_DIR ?= .
-
-# The variable OBJ_DIR gives the location where object files and the
-# FreeType library are built.
-#
-OBJ_DIR ?= $(TOP_DIR)/objs
-
-
-include $(TOP_DIR)/builds/toplevel.mk
-
-# EOF
+#
+# FreeType 2 build system -- top-level Makefile
+#
+
+
+# Copyright (C) 1996-2019 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
+# Project names
+#
+PROJECT       := freetype
+PROJECT_TITLE := FreeType
+
+# The variable TOP_DIR holds the path to the topmost directory in the project
+# engine source hierarchy.  If it is not defined, default it to `.'.
+#
+TOP_DIR ?= .
+
+# The variable OBJ_DIR gives the location where object files and the
+# FreeType library are built.
+#
+OBJ_DIR ?= $(TOP_DIR)/objs
+
+
+include $(TOP_DIR)/builds/toplevel.mk
+
+# EOF

FreeType/freetype/README

@@ -1,84 +1,84 @@
-  FreeType 2.10.1
-  ===============
-
-  Homepage: https://www.freetype.org
-
-  FreeType is a freely available software library to render fonts.
-
-  It  is  written  in  C,  designed to  be  small,  efficient,  highly
-  customizable, and  portable while capable of  producing high-quality
-  output  (glyph  images) of  most  vector  and bitmap  font  formats.
-
-  Please   read   the  docs/CHANGES   file,   it  contains   IMPORTANT
-  INFORMATION.
-
-  Read the  files `docs/INSTALL*'  for installation  instructions; see
-  the file `docs/LICENSE.TXT' for the available licenses.
-
-  The FreeType  2 API  reference is located  in `docs/reference/site';
-  use  the  file `index.html'  as  the  top entry  point.   Additional
-  documentation is available as a separate package from our sites.  Go
-  to
-
-    https://download.savannah.gnu.org/releases/freetype/
-
-  and download one of the following files.
-
-    freetype-doc-2.10.1.tar.xz
-    freetype-doc-2.10.1.tar.gz
-    ftdoc2101.zip
-
-  To view the documentation online, go to
-
-    https://www.freetype.org/freetype2/docs/
-
-
-  Mailing Lists
-  =============
-
-  The preferred way  of communication with the FreeType  team is using
-  e-mail lists.
-
-    general use and discussion:      freetype@nongnu.org
-    engine internals, porting, etc.: freetype-devel@nongnu.org
-    announcements:                   freetype-announce@nongnu.org
-    git repository tracker:          freetype-commit@nongnu.org
-
-  The lists are moderated; see
-
-    https://www.freetype.org/contact.html
-
-  how to subscribe.
-
-
-  Bugs
-  ====
-
-  Please submit bug reports at
-
-    https://savannah.nongnu.org/bugs/?group=freetype
-
-  Alternatively,    you   might    report    bugs    by   e-mail    to
-  `freetype-devel@nongnu.org'.   Don't  forget   to  send  a  detailed
-  explanation of the problem --  there is nothing worse than receiving
-  a terse message that only says `it doesn't work'.
-
-
-  Enjoy!
-
-
-    The FreeType Team
-
-----------------------------------------------------------------------
-
-Copyright (C) 2006-2019 by
-David Turner, Robert Wilhelm, and Werner Lemberg.
-
-This  file is  part of  the FreeType  project, and  may only  be used,
-modified,  and distributed  under the  terms of  the  FreeType project
-license,  LICENSE.TXT.  By  continuing to  use, modify,  or distribute
-this file you  indicate that you have read  the license and understand
-and accept it fully.
-
-
---- end of README ---
+  FreeType 2.10.1
+  ===============
+
+  Homepage: https://www.freetype.org
+
+  FreeType is a freely available software library to render fonts.
+
+  It  is  written  in  C,  designed to  be  small,  efficient,  highly
+  customizable, and  portable while capable of  producing high-quality
+  output  (glyph  images) of  most  vector  and bitmap  font  formats.
+
+  Please   read   the  docs/CHANGES   file,   it  contains   IMPORTANT
+  INFORMATION.
+
+  Read the  files `docs/INSTALL*'  for installation  instructions; see
+  the file `docs/LICENSE.TXT' for the available licenses.
+
+  The FreeType  2 API  reference is located  in `docs/reference/site';
+  use  the  file `index.html'  as  the  top entry  point.   Additional
+  documentation is available as a separate package from our sites.  Go
+  to
+
+    https://download.savannah.gnu.org/releases/freetype/
+
+  and download one of the following files.
+
+    freetype-doc-2.10.1.tar.xz
+    freetype-doc-2.10.1.tar.gz
+    ftdoc2101.zip
+
+  To view the documentation online, go to
+
+    https://www.freetype.org/freetype2/docs/
+
+
+  Mailing Lists
+  =============
+
+  The preferred way  of communication with the FreeType  team is using
+  e-mail lists.
+
+    general use and discussion:      freetype@nongnu.org
+    engine internals, porting, etc.: freetype-devel@nongnu.org
+    announcements:                   freetype-announce@nongnu.org
+    git repository tracker:          freetype-commit@nongnu.org
+
+  The lists are moderated; see
+
+    https://www.freetype.org/contact.html
+
+  how to subscribe.
+
+
+  Bugs
+  ====
+
+  Please submit bug reports at
+
+    https://savannah.nongnu.org/bugs/?group=freetype
+
+  Alternatively,    you   might    report    bugs    by   e-mail    to
+  `freetype-devel@nongnu.org'.   Don't  forget   to  send  a  detailed
+  explanation of the problem --  there is nothing worse than receiving
+  a terse message that only says `it doesn't work'.
+
+
+  Enjoy!
+
+
+    The FreeType Team
+
+----------------------------------------------------------------------
+
+Copyright (C) 2006-2019 by
+David Turner, Robert Wilhelm, and Werner Lemberg.
+
+This  file is  part of  the FreeType  project, and  may only  be used,
+modified,  and distributed  under the  terms of  the  FreeType project
+license,  LICENSE.TXT.  By  continuing to  use, modify,  or distribute
+this file you  indicate that you have read  the license and understand
+and accept it fully.
+
+
+--- end of README ---

FreeType/freetype/builds/amiga/README

@@ -1,110 +1,110 @@
-
-README for the builds/amiga subdirectory.
-
-Copyright (C) 2005-2019 by
-Werner Lemberg and Detlef W<>rkner.
-
-This file is part of the FreeType project, and may only be used, modified,
-and distributed under the terms of the FreeType project license,
-LICENSE.TXT.  By continuing to use, modify, or distribute this file you
-indicate that you have read the license and understand and accept it
-fully.
-
-
-The makefile.os4 is for the AmigaOS4 SDK.  To use it, type
-"make -f makefile.os4", it produces a link library libft2_ppc.a.
-
-The makefile is for ppc-morphos-gcc-2.95.3-bin.tgz (gcc 2.95.3 hosted on
-68k-Amiga producing MorphOS-PPC-binaries from http://www.morphos.de).
-To use it, type "make assign", then "make"; it produces a link library
-libft2_ppc.a.
-
-The smakefile is a makefile for Amiga SAS/C 6.58 (no longer available,
-latest sold version was 6.50, updates can be found in Aminet).  It is
-based on the version found in the sourcecode of ttf.library 0.83b for
-FreeType 1.3.1 from Richard Griffith (ragriffi@sprynet.com,
-http://ragriffi.home.sprynet.com).
-
-You will also need the latest include files and amiga.lib from the
-Amiga web site (https://os.amigaworld.de/download.php?id=3) for
-AmigaOS 3.9; the generated code should work under AmigaOS 2.04 and up.
-
-To use it, call "smake assign" and then "smake" from the builds/amiga
-directory.  The results are:
-
-- A link library "ft2_680x0.lib" (where x depends on the setting of
-  the CPU entry in the smakefile) containing all FreeType2 parts
-  except of the init code, debugging code, and the system interface
-  code.
-
-- ftsystem.o, an object module containing the standard version of the
-  system interface code which uses fopen() fclose() fread() fseek()
-  ftell() malloc() realloc() and free() from lib:sc.lib (not pure).
-
-- ftsystempure.o, an object module containing the pure version of the
-  system interface code which uses Open() Close() Read() Seek()
-  ExamineFH() AsmAllocPooled() AsmFreePooled() etc.  This version can
-  be used in both normal programs and in Amiga run-time shared system
-  librarys (can be linked with lib:libinit.o, no copying of DATA and
-  BSS hunks for each OpenLibrary() necessary).  Source code is in
-  src/base/ftsystem.c.
-
-- ftdebug.o, an object module containing the standard version of the
-  debugging code which uses vprintf() and exit() (not pure).
-  Debugging can be turned on in FT:include/freetype/config/ftoption.h
-  and with FT_SetTraceLevel().
-
-- ftdebugpure.o, an object module containing the pure version of the
-  debugging code which uses KVPrintf() from lib:debug.lib and no
-  exit().  For debugging of Amiga run-time shared system libraries.
-  Source code is in src/base/ftdebug.c.
-
-- NO ftinit.o.  Because linking with a link library should result in
-  linking only the needed object modules in it, but standard
-  ftsystem.o would force ALL FreeType2 modules to be linked to your
-  program, I decided to use a different scheme: You must #include
-  FT:src/base/ftinit.c in your sourcecode and specify with #define
-  statements which modules you need.  See
-  include/freetype/config/ftmodule.h.
-
-
-To use in your own programs:
-
-- Insert the #define and #include statements from top of
-  include/freetype/config/ftmodule.h in your source code and
-  uncomment the #define statements for the FreeType2 modules you need.
-
-- You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for
-  calling the FreeType2 functions, because the link library and the
-  object files are compiled with PARAMETERS=BOTH.
-
-- "smake assign" (assign "FT:" to the FreeType2 main directory).
-
-- Compile your program.
-
-- Link with either ftsystem.o or ftsystempure.o, if debugging enabled
-  with either ftdebug.o or (ftdebugpure.o and lib:debug.lib), and with
-  ft2_680x0.lib as link library.
-
-
-To adapt to other compilers:
-
-- The standard ANSI C maximum length of 31 significant characters in
-  identifiers is not enough for FreeType2.  Check if your compiler has
-  a minimum length of 40 significant characters or can be switched to
-  it.  "idlen=40" is the option for SAS/C.  Setting #define
-  HAVE_LIMIT_ON_IDENTS in an include file may also work (not tested).
-
-- Make sure that the include directory in builds/amiga is searched
-  before the normal FreeType2 include directory, so you are able to
-  replace problematic include files with your own version (same may be
-  useful for the src directory).
-
-- An example of how to replace/workaround a problematic include file
-  is include/freetype/config/ftconfig.h; it changes a #define that
-  would prevent SAS/C from generating XDEF's where it should do that and
-  then includes the standard FreeType2 include file.
-
-Local Variables:
-coding: latin-1
-End:
+
+README for the builds/amiga subdirectory.
+
+Copyright (C) 2005-2019 by
+Werner Lemberg and Detlef W<>rkner.
+
+This file is part of the FreeType project, and may only be used, modified,
+and distributed under the terms of the FreeType project license,
+LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+indicate that you have read the license and understand and accept it
+fully.
+
+
+The makefile.os4 is for the AmigaOS4 SDK.  To use it, type
+"make -f makefile.os4", it produces a link library libft2_ppc.a.
+
+The makefile is for ppc-morphos-gcc-2.95.3-bin.tgz (gcc 2.95.3 hosted on
+68k-Amiga producing MorphOS-PPC-binaries from http://www.morphos.de).
+To use it, type "make assign", then "make"; it produces a link library
+libft2_ppc.a.
+
+The smakefile is a makefile for Amiga SAS/C 6.58 (no longer available,
+latest sold version was 6.50, updates can be found in Aminet).  It is
+based on the version found in the sourcecode of ttf.library 0.83b for
+FreeType 1.3.1 from Richard Griffith (ragriffi@sprynet.com,
+http://ragriffi.home.sprynet.com).
+
+You will also need the latest include files and amiga.lib from the
+Amiga web site (https://os.amigaworld.de/download.php?id=3) for
+AmigaOS 3.9; the generated code should work under AmigaOS 2.04 and up.
+
+To use it, call "smake assign" and then "smake" from the builds/amiga
+directory.  The results are:
+
+- A link library "ft2_680x0.lib" (where x depends on the setting of
+  the CPU entry in the smakefile) containing all FreeType2 parts
+  except of the init code, debugging code, and the system interface
+  code.
+
+- ftsystem.o, an object module containing the standard version of the
+  system interface code which uses fopen() fclose() fread() fseek()
+  ftell() malloc() realloc() and free() from lib:sc.lib (not pure).
+
+- ftsystempure.o, an object module containing the pure version of the
+  system interface code which uses Open() Close() Read() Seek()
+  ExamineFH() AsmAllocPooled() AsmFreePooled() etc.  This version can
+  be used in both normal programs and in Amiga run-time shared system
+  librarys (can be linked with lib:libinit.o, no copying of DATA and
+  BSS hunks for each OpenLibrary() necessary).  Source code is in
+  src/base/ftsystem.c.
+
+- ftdebug.o, an object module containing the standard version of the
+  debugging code which uses vprintf() and exit() (not pure).
+  Debugging can be turned on in FT:include/freetype/config/ftoption.h
+  and with FT_SetTraceLevel().
+
+- ftdebugpure.o, an object module containing the pure version of the
+  debugging code which uses KVPrintf() from lib:debug.lib and no
+  exit().  For debugging of Amiga run-time shared system libraries.
+  Source code is in src/base/ftdebug.c.
+
+- NO ftinit.o.  Because linking with a link library should result in
+  linking only the needed object modules in it, but standard
+  ftsystem.o would force ALL FreeType2 modules to be linked to your
+  program, I decided to use a different scheme: You must #include
+  FT:src/base/ftinit.c in your sourcecode and specify with #define
+  statements which modules you need.  See
+  include/freetype/config/ftmodule.h.
+
+
+To use in your own programs:
+
+- Insert the #define and #include statements from top of
+  include/freetype/config/ftmodule.h in your source code and
+  uncomment the #define statements for the FreeType2 modules you need.
+
+- You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for
+  calling the FreeType2 functions, because the link library and the
+  object files are compiled with PARAMETERS=BOTH.
+
+- "smake assign" (assign "FT:" to the FreeType2 main directory).
+
+- Compile your program.
+
+- Link with either ftsystem.o or ftsystempure.o, if debugging enabled
+  with either ftdebug.o or (ftdebugpure.o and lib:debug.lib), and with
+  ft2_680x0.lib as link library.
+
+
+To adapt to other compilers:
+
+- The standard ANSI C maximum length of 31 significant characters in
+  identifiers is not enough for FreeType2.  Check if your compiler has
+  a minimum length of 40 significant characters or can be switched to
+  it.  "idlen=40" is the option for SAS/C.  Setting #define
+  HAVE_LIMIT_ON_IDENTS in an include file may also work (not tested).
+
+- Make sure that the include directory in builds/amiga is searched
+  before the normal FreeType2 include directory, so you are able to
+  replace problematic include files with your own version (same may be
+  useful for the src directory).
+
+- An example of how to replace/workaround a problematic include file
+  is include/freetype/config/ftconfig.h; it changes a #define that
+  would prevent SAS/C from generating XDEF's where it should do that and
+  then includes the standard FreeType2 include file.
+
+Local Variables:
+coding: latin-1
+End:

FreeType/freetype/builds/amiga/include/config/ftconfig.h

@@ -1,55 +1,55 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftconfig.h                                                             */
-/*                                                                         */
-/*    Amiga-specific configuration file (specification only).              */
-/*                                                                         */
-/*  Copyright (C) 2005-2019 by                                             */
-/*  Werner Lemberg and Detlef W<>rkner.                                     */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/*
- * This is an example how to override the default FreeType2 header files
- * with Amiga-specific changes. When the compiler searches this directory
- * before the default directory, we can do some modifications.
- *
- * Here we must change FT_EXPORT_DEF so that SAS/C does
- * generate the needed XDEFs.
- */
-
-#if 0
-#define FT_EXPORT_DEF( x )  extern  x
-#endif
-
-#undef FT_EXPORT_DEF
-#define FT_EXPORT_DEF( x )  x
-
-/* Now include the original file */
-#ifndef __MORPHOS__
-#ifdef __SASC
-#include "FT:include/freetype/config/ftconfig.h"
-#else
-#include "/FT/include/freetype/config/ftconfig.h"
-#endif
-#else
-/* We must define that, it seems that
- * lib/gcc-lib/ppc-morphos/2.95.3/include/syslimits.h is missing in
- * ppc-morphos-gcc-2.95.3-bin.tgz (gcc for 68k producing MorphOS PPC elf
- * binaries from http://www.morphos.de)
- */
-#define _LIBC_LIMITS_H_
-#include "/FT/include/freetype/config/ftconfig.h"
-#endif
-
-/*
-Local Variables:
-coding: latin-1
-End:
-*/
+/***************************************************************************/
+/*                                                                         */
+/*  ftconfig.h                                                             */
+/*                                                                         */
+/*    Amiga-specific configuration file (specification only).              */
+/*                                                                         */
+/*  Copyright (C) 2005-2019 by                                             */
+/*  Werner Lemberg and Detlef W<>rkner.                                     */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+/*
+ * This is an example how to override the default FreeType2 header files
+ * with Amiga-specific changes. When the compiler searches this directory
+ * before the default directory, we can do some modifications.
+ *
+ * Here we must change FT_EXPORT_DEF so that SAS/C does
+ * generate the needed XDEFs.
+ */
+
+#if 0
+#define FT_EXPORT_DEF( x )  extern  x
+#endif
+
+#undef FT_EXPORT_DEF
+#define FT_EXPORT_DEF( x )  x
+
+/* Now include the original file */
+#ifndef __MORPHOS__
+#ifdef __SASC
+#include "FT:include/freetype/config/ftconfig.h"
+#else
+#include "/FT/include/freetype/config/ftconfig.h"
+#endif
+#else
+/* We must define that, it seems that
+ * lib/gcc-lib/ppc-morphos/2.95.3/include/syslimits.h is missing in
+ * ppc-morphos-gcc-2.95.3-bin.tgz (gcc for 68k producing MorphOS PPC elf
+ * binaries from http://www.morphos.de)
+ */
+#define _LIBC_LIMITS_H_
+#include "/FT/include/freetype/config/ftconfig.h"
+#endif
+
+/*
+Local Variables:
+coding: latin-1
+End:
+*/

FreeType/freetype/builds/amiga/include/config/ftmodule.h

@@ -1,160 +1,160 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmodule.h                                                             */
-/*                                                                         */
-/*    Amiga-specific FreeType module selection.                            */
-/*                                                                         */
-/*  Copyright (C) 2005-2019 by                                             */
-/*  Werner Lemberg and Detlef W<>rkner.                                     */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/*
- * To avoid that all your programs include all FreeType modules,
- * you copy the following piece of source code into your own
- * source file and specify which modules you really need in your
- * application by uncommenting the appropriate lines.
- */
-/*
-//#define FT_USE_AUTOFIT // autofitter
-//#define FT_USE_RASTER  // monochrome rasterizer
-//#define FT_USE_SMOOTH  // anti-aliasing rasterizer
-//#define FT_USE_TT      // truetype font driver
-//#define FT_USE_T1      // type1 font driver
-//#define FT_USE_T42     // type42 font driver
-//#define FT_USE_T1CID   // cid-keyed type1 font driver  // no cmap support
-//#define FT_USE_CFF     // opentype font driver
-//#define FT_USE_BDF     // bdf bitmap font driver
-//#define FT_USE_PCF     // pcf bitmap font driver
-//#define FT_USE_PFR     // pfr font driver
-//#define FT_USE_WINFNT  // windows .fnt|.fon bitmap font driver
-//#define FT_USE_OTV     // opentype validator
-//#define FT_USE_GXV     // truetype gx validator
-#include "FT:src/base/ftinit.c"
-*/
-
-/* Make sure that the needed support modules are built in.
- * Dependencies can be found by searching for FT_Get_Module.
- */
-
-#ifdef FT_USE_T42
-#define FT_USE_TT
-#endif
-
-#ifdef FT_USE_TT
-#define FT_USE_SFNT
-#endif
-
-#ifdef FT_USE_CFF
-#define FT_USE_SFNT
-#define FT_USE_PSHINT
-#define FT_USE_PSNAMES
-#endif
-
-#ifdef FT_USE_T1
-#define FT_USE_PSAUX
-#define FT_USE_PSHINT
-#define FT_USE_PSNAMES
-#endif
-
-#ifdef FT_USE_T1CID
-#define FT_USE_PSAUX
-#define FT_USE_PSHINT
-#define FT_USE_PSNAMES
-#endif
-
-#ifdef FT_USE_PSAUX
-#define FT_USE_PSNAMES
-#endif
-
-#ifdef FT_USE_SFNT
-#define FT_USE_PSNAMES
-#endif
-
-/* Now include the modules */
-
-#ifdef FT_USE_AUTOFIT
-FT_USE_MODULE( FT_Module_Class, autofit_module_class )
-#endif
-
-#ifdef FT_USE_TT
-FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
-#endif
-
-#ifdef FT_USE_T1
-FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
-#endif
-
-#ifdef FT_USE_CFF
-FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
-#endif
-
-#ifdef FT_USE_T1CID
-FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
-#endif
-
-#ifdef FT_USE_PFR
-FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
-#endif
-
-#ifdef FT_USE_T42
-FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
-#endif
-
-#ifdef FT_USE_WINFNT
-FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
-#endif
-
-#ifdef FT_USE_PCF
-FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
-#endif
-
-#ifdef FT_USE_PSAUX
-FT_USE_MODULE( FT_Module_Class, psaux_module_class )
-#endif
-
-#ifdef FT_USE_PSNAMES
-FT_USE_MODULE( FT_Module_Class, psnames_module_class )
-#endif
-
-#ifdef FT_USE_PSHINT
-FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
-#endif
-
-#ifdef FT_USE_RASTER
-FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
-#endif
-
-#ifdef FT_USE_SFNT
-FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
-#endif
-
-#ifdef FT_USE_SMOOTH
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
-#endif
-
-#ifdef FT_USE_OTV
-FT_USE_MODULE( FT_Module_Class, otv_module_class )
-#endif
-
-#ifdef FT_USE_BDF
-FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
-#endif
-
-#ifdef FT_USE_GXV
-FT_USE_MODULE( FT_Module_Class, gxv_module_class )
-#endif
-
-/*
-Local Variables:
-coding: latin-1
-End:
-*/
+/***************************************************************************/
+/*                                                                         */
+/*  ftmodule.h                                                             */
+/*                                                                         */
+/*    Amiga-specific FreeType module selection.                            */
+/*                                                                         */
+/*  Copyright (C) 2005-2019 by                                             */
+/*  Werner Lemberg and Detlef W<>rkner.                                     */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+/*
+ * To avoid that all your programs include all FreeType modules,
+ * you copy the following piece of source code into your own
+ * source file and specify which modules you really need in your
+ * application by uncommenting the appropriate lines.
+ */
+/*
+//#define FT_USE_AUTOFIT // autofitter
+//#define FT_USE_RASTER  // monochrome rasterizer
+//#define FT_USE_SMOOTH  // anti-aliasing rasterizer
+//#define FT_USE_TT      // truetype font driver
+//#define FT_USE_T1      // type1 font driver
+//#define FT_USE_T42     // type42 font driver
+//#define FT_USE_T1CID   // cid-keyed type1 font driver  // no cmap support
+//#define FT_USE_CFF     // opentype font driver
+//#define FT_USE_BDF     // bdf bitmap font driver
+//#define FT_USE_PCF     // pcf bitmap font driver
+//#define FT_USE_PFR     // pfr font driver
+//#define FT_USE_WINFNT  // windows .fnt|.fon bitmap font driver
+//#define FT_USE_OTV     // opentype validator
+//#define FT_USE_GXV     // truetype gx validator
+#include "FT:src/base/ftinit.c"
+*/
+
+/* Make sure that the needed support modules are built in.
+ * Dependencies can be found by searching for FT_Get_Module.
+ */
+
+#ifdef FT_USE_T42
+#define FT_USE_TT
+#endif
+
+#ifdef FT_USE_TT
+#define FT_USE_SFNT
+#endif
+
+#ifdef FT_USE_CFF
+#define FT_USE_SFNT
+#define FT_USE_PSHINT
+#define FT_USE_PSNAMES
+#endif
+
+#ifdef FT_USE_T1
+#define FT_USE_PSAUX
+#define FT_USE_PSHINT
+#define FT_USE_PSNAMES
+#endif
+
+#ifdef FT_USE_T1CID
+#define FT_USE_PSAUX
+#define FT_USE_PSHINT
+#define FT_USE_PSNAMES
+#endif
+
+#ifdef FT_USE_PSAUX
+#define FT_USE_PSNAMES
+#endif
+
+#ifdef FT_USE_SFNT
+#define FT_USE_PSNAMES
+#endif
+
+/* Now include the modules */
+
+#ifdef FT_USE_AUTOFIT
+FT_USE_MODULE( FT_Module_Class, autofit_module_class )
+#endif
+
+#ifdef FT_USE_TT
+FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
+#endif
+
+#ifdef FT_USE_T1
+FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
+#endif
+
+#ifdef FT_USE_CFF
+FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
+#endif
+
+#ifdef FT_USE_T1CID
+FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
+#endif
+
+#ifdef FT_USE_PFR
+FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
+#endif
+
+#ifdef FT_USE_T42
+FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
+#endif
+
+#ifdef FT_USE_WINFNT
+FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
+#endif
+
+#ifdef FT_USE_PCF
+FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
+#endif
+
+#ifdef FT_USE_PSAUX
+FT_USE_MODULE( FT_Module_Class, psaux_module_class )
+#endif
+
+#ifdef FT_USE_PSNAMES
+FT_USE_MODULE( FT_Module_Class, psnames_module_class )
+#endif
+
+#ifdef FT_USE_PSHINT
+FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
+#endif
+
+#ifdef FT_USE_RASTER
+FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
+#endif
+
+#ifdef FT_USE_SFNT
+FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
+#endif
+
+#ifdef FT_USE_SMOOTH
+FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
+#endif
+
+#ifdef FT_USE_OTV
+FT_USE_MODULE( FT_Module_Class, otv_module_class )
+#endif
+
+#ifdef FT_USE_BDF
+FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
+#endif
+
+#ifdef FT_USE_GXV
+FT_USE_MODULE( FT_Module_Class, gxv_module_class )
+#endif
+
+/*
+Local Variables:
+coding: latin-1
+End:
+*/

FreeType/freetype/builds/amiga/src/base/ftdebug.c

@@ -1,348 +1,348 @@
-/****************************************************************************
- *
- * ftdebug.c
- *
- *   Debugging and logging component for amiga (body).
- *
- * Copyright (C) 1996-2019 by
- * David Turner, Robert Wilhelm, Werner Lemberg, and Detlef Wuerkner.
- *
- * This file is part of the FreeType project, and may only be used,
- * modified, and distributed under the terms of the FreeType project
- * license, LICENSE.TXT.  By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- */
-
-
-  /**************************************************************************
-   *
-   * This component contains various macros and functions used to ease the
-   * debugging of the FreeType engine.  Its main purpose is in assertion
-   * checking, tracing, and error detection.
-   *
-   * There are now three debugging modes:
-   *
-   * - trace mode
-   *
-   *   Error and trace messages are sent to the log file (which can be the
-   *   standard error output).
-   *
-   * - error mode
-   *
-   *   Only error messages are generated.
-   *
-   * - release mode:
-   *
-   *   No error message is sent or generated.  The code is free from any
-   *   debugging parts.
-   *
-   */
-
-
-  /*
-   * Based on the default `ftdebug.c' file,
-   * replaced `vprintf' with `KVPrintF',
-   * commented out `exit',
-   * replaced `getenv' with `GetVar'.
-   */
-
-#include <exec/types.h>
-#include <utility/tagitem.h>
-#include <dos/exall.h>
-#include <dos/var.h>
-
-#define __NOLIBBASE__
-#define __NOLOBALIFACE__
-#define __USE_INLINE__
-
-#include <proto/dos.h>
-#include <clib/debug_protos.h>
-
-#ifndef __amigaos4__
-  extern struct Library*  DOSBase;
-#else
-  extern struct DOSIFace*  IDOS;
-#endif
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_INTERNAL_DEBUG_H
-
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-  /* documentation is in ftdebug.h */
-
-  FT_BASE_DEF( void )
-  FT_Message( const char*  fmt,
-              ... )
-  {
-    va_list  ap;
-
-
-    va_start( ap, fmt );
-    KVPrintF( fmt, ap );
-    va_end( ap );
-  }
-
-
-  /* documentation is in ftdebug.h */
-
-  FT_BASE_DEF( void )
-  FT_Panic( const char*  fmt,
-            ... )
-  {
-    va_list  ap;
-
-
-    va_start( ap, fmt );
-    KVPrintF( fmt, ap );
-    va_end( ap );
-
-    /* exit( EXIT_FAILURE ); */
-  }
-
-
-  /* documentation is in ftdebug.h */
-
-  FT_BASE_DEF( int )
-  FT_Throw( FT_Error     error,
-            int          line,
-            const char*  file )
-  {
-#if 0
-    /* activating the code in this block makes FreeType very chatty */
-    fprintf( stderr,
-             "%s:%d: error 0x%02x: %s\n",
-             file,
-             line,
-             error,
-             FT_Error_String( error ) );
-#else
-    FT_UNUSED( error );
-    FT_UNUSED( line );
-    FT_UNUSED( file );
-#endif
-
-    return 0;
-  }
-
-#endif /* FT_DEBUG_LEVEL_ERROR */
-
-
-
-#ifdef FT_DEBUG_LEVEL_TRACE
-
-  /* array of trace levels, initialized to 0; */
-  /* this gets adjusted at run-time           */
-  static int  ft_trace_levels_enabled[trace_count];
-
-  /* array of trace levels, always initialized to 0 */
-  static int  ft_trace_levels_disabled[trace_count];
-
-  /* a pointer to either `ft_trace_levels_enabled' */
-  /* or `ft_trace_levels_disabled'                 */
-  int*  ft_trace_levels;
-
-  /* define array of trace toggle names */
-#define FT_TRACE_DEF( x )  #x ,
-
-  static const char*  ft_trace_toggles[trace_count + 1] =
-  {
-#include FT_INTERNAL_TRACE_H
-    NULL
-  };
-
-#undef FT_TRACE_DEF
-
-
-  /* documentation is in ftdebug.h */
-
-  FT_BASE_DEF( FT_Int )
-  FT_Trace_Get_Count( void )
-  {
-    return trace_count;
-  }
-
-
-  /* documentation is in ftdebug.h */
-
-  FT_BASE_DEF( const char * )
-  FT_Trace_Get_Name( FT_Int  idx )
-  {
-    int  max = FT_Trace_Get_Count();
-
-
-    if ( idx < max )
-      return ft_trace_toggles[idx];
-    else
-      return NULL;
-  }
-
-
-  /* documentation is in ftdebug.h */
-
-  FT_BASE_DEF( void )
-  FT_Trace_Disable( void )
-  {
-    ft_trace_levels = ft_trace_levels_disabled;
-  }
-
-
-  /* documentation is in ftdebug.h */
-
-  FT_BASE_DEF( void )
-  FT_Trace_Enable( void )
-  {
-    ft_trace_levels = ft_trace_levels_enabled;
-  }
-
-
-  /**************************************************************************
-   *
-   * Initialize the tracing sub-system.  This is done by retrieving the
-   * value of the `FT2_DEBUG' environment variable.  It must be a list of
-   * toggles, separated by spaces, `;', or `,'.  Example:
-   *
-   *   export FT2_DEBUG="any:3 memory:7 stream:5"
-   *
-   * This requests that all levels be set to 3, except the trace level for
-   * the memory and stream components which are set to 7 and 5,
-   * respectively.
-   *
-   * See the file `include/freetype/internal/fttrace.h' for details of
-   * the available toggle names.
-   *
-   * The level must be between 0 and 7; 0 means quiet (except for serious
-   * runtime errors), and 7 means _very_ verbose.
-   */
-  FT_BASE_DEF( void )
-  ft_debug_init( void )
-  {
-    /* const char*  ft2_debug = ft_getenv( "FT2_DEBUG" ); */
-    char         buf[256];
-    const char*  ft2_debug = &buf[0];
-
-
-    /* if ( ft2_debug ) */
-    if ( GetVar( "FT2_DEBUG", (STRPTR)ft2_debug, 256, LV_VAR ) > 0 )
-    {
-      const char*  p = ft2_debug;
-      const char*  q;
-
-
-      for ( ; *p; p++ )
-      {
-        /* skip leading whitespace and separators */
-        if ( *p == ' ' || *p == '\t' || *p == ',' || *p == ';' || *p == '=' )
-          continue;
-
-        /* read toggle name, followed by ':' */
-        q = p;
-        while ( *p && *p != ':' )
-          p++;
-
-        if ( !*p )
-          break;
-
-        if ( *p == ':' && p > q )
-        {
-          FT_Int  n, i, len = (FT_Int)( p - q );
-          FT_Int  level = -1, found = -1;
-
-
-          for ( n = 0; n < trace_count; n++ )
-          {
-            const char*  toggle = ft_trace_toggles[n];
-
-
-            for ( i = 0; i < len; i++ )
-            {
-              if ( toggle[i] != q[i] )
-                break;
-            }
-
-            if ( i == len && toggle[i] == 0 )
-            {
-              found = n;
-              break;
-            }
-          }
-
-          /* read level */
-          p++;
-          if ( *p )
-          {
-            level = *p - '0';
-            if ( level < 0 || level > 7 )
-              level = -1;
-          }
-
-          if ( found >= 0 && level >= 0 )
-          {
-            if ( found == trace_any )
-            {
-              /* special case for `any' */
-              for ( n = 0; n < trace_count; n++ )
-                ft_trace_levels_enabled[n] = level;
-            }
-            else
-              ft_trace_levels_enabled[found] = level;
-          }
-        }
-      }
-    }
-
-    ft_trace_levels = ft_trace_levels_enabled;
-  }
-
-
-#else  /* !FT_DEBUG_LEVEL_TRACE */
-
-
-  FT_BASE_DEF( void )
-  ft_debug_init( void )
-  {
-    /* nothing */
-  }
-
-
-  FT_BASE_DEF( FT_Int )
-  FT_Trace_Get_Count( void )
-  {
-    return 0;
-  }
-
-
-  FT_BASE_DEF( const char * )
-  FT_Trace_Get_Name( FT_Int  idx )
-  {
-    FT_UNUSED( idx );
-
-    return NULL;
-  }
-
-
-  FT_BASE_DEF( void )
-  FT_Trace_Disable( void )
-  {
-    /* nothing */
-  }
-
-
-  /* documentation is in ftdebug.h */
-
-  FT_BASE_DEF( void )
-  FT_Trace_Enable( void )
-  {
-    /* nothing */
-  }
-
-
-#endif /* !FT_DEBUG_LEVEL_TRACE */
-
-
-/* END */
+/****************************************************************************
+ *
+ * ftdebug.c
+ *
+ *   Debugging and logging component for amiga (body).
+ *
+ * Copyright (C) 1996-2019 by
+ * David Turner, Robert Wilhelm, Werner Lemberg, and Detlef Wuerkner.
+ *
+ * This file is part of the FreeType project, and may only be used,
+ * modified, and distributed under the terms of the FreeType project
+ * license, LICENSE.TXT.  By continuing to use, modify, or distribute
+ * this file you indicate that you have read the license and
+ * understand and accept it fully.
+ *
+ */
+
+
+  /**************************************************************************
+   *
+   * This component contains various macros and functions used to ease the
+   * debugging of the FreeType engine.  Its main purpose is in assertion
+   * checking, tracing, and error detection.
+   *
+   * There are now three debugging modes:
+   *
+   * - trace mode
+   *
+   *   Error and trace messages are sent to the log file (which can be the
+   *   standard error output).
+   *
+   * - error mode
+   *
+   *   Only error messages are generated.
+   *
+   * - release mode:
+   *
+   *   No error message is sent or generated.  The code is free from any
+   *   debugging parts.
+   *
+   */
+
+
+  /*
+   * Based on the default `ftdebug.c' file,
+   * replaced `vprintf' with `KVPrintF',
+   * commented out `exit',
+   * replaced `getenv' with `GetVar'.
+   */
+
+#include <exec/types.h>
+#include <utility/tagitem.h>
+#include <dos/exall.h>
+#include <dos/var.h>
+
+#define __NOLIBBASE__
+#define __NOLOBALIFACE__
+#define __USE_INLINE__
+
+#include <proto/dos.h>
+#include <clib/debug_protos.h>
+
+#ifndef __amigaos4__
+  extern struct Library*  DOSBase;
+#else
+  extern struct DOSIFace*  IDOS;
+#endif
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_INTERNAL_DEBUG_H
+
+
+#ifdef FT_DEBUG_LEVEL_ERROR
+
+  /* documentation is in ftdebug.h */
+
+  FT_BASE_DEF( void )
+  FT_Message( const char*  fmt,
+              ... )
+  {
+    va_list  ap;
+
+
+    va_start( ap, fmt );
+    KVPrintF( fmt, ap );
+    va_end( ap );
+  }
+
+
+  /* documentation is in ftdebug.h */
+
+  FT_BASE_DEF( void )
+  FT_Panic( const char*  fmt,
+            ... )
+  {
+    va_list  ap;
+
+
+    va_start( ap, fmt );
+    KVPrintF( fmt, ap );
+    va_end( ap );
+
+    /* exit( EXIT_FAILURE ); */
+  }
+
+
+  /* documentation is in ftdebug.h */
+
+  FT_BASE_DEF( int )
+  FT_Throw( FT_Error     error,
+            int          line,
+            const char*  file )
+  {
+#if 0
+    /* activating the code in this block makes FreeType very chatty */
+    fprintf( stderr,
+             "%s:%d: error 0x%02x: %s\n",
+             file,
+             line,
+             error,
+             FT_Error_String( error ) );
+#else
+    FT_UNUSED( error );
+    FT_UNUSED( line );
+    FT_UNUSED( file );
+#endif
+
+    return 0;
+  }
+
+#endif /* FT_DEBUG_LEVEL_ERROR */
+
+
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+
+  /* array of trace levels, initialized to 0; */
+  /* this gets adjusted at run-time           */
+  static int  ft_trace_levels_enabled[trace_count];
+
+  /* array of trace levels, always initialized to 0 */
+  static int  ft_trace_levels_disabled[trace_count];
+
+  /* a pointer to either `ft_trace_levels_enabled' */
+  /* or `ft_trace_levels_disabled'                 */
+  int*  ft_trace_levels;
+
+  /* define array of trace toggle names */
+#define FT_TRACE_DEF( x )  #x ,
+
+  static const char*  ft_trace_toggles[trace_count + 1] =
+  {
+#include FT_INTERNAL_TRACE_H
+    NULL
+  };
+
+#undef FT_TRACE_DEF
+
+
+  /* documentation is in ftdebug.h */
+
+  FT_BASE_DEF( FT_Int )
+  FT_Trace_Get_Count( void )
+  {
+    return trace_count;
+  }
+
+
+  /* documentation is in ftdebug.h */
+
+  FT_BASE_DEF( const char * )
+  FT_Trace_Get_Name( FT_Int  idx )
+  {
+    int  max = FT_Trace_Get_Count();
+
+
+    if ( idx < max )
+      return ft_trace_toggles[idx];
+    else
+      return NULL;
+  }
+
+
+  /* documentation is in ftdebug.h */
+
+  FT_BASE_DEF( void )
+  FT_Trace_Disable( void )
+  {
+    ft_trace_levels = ft_trace_levels_disabled;
+  }
+
+
+  /* documentation is in ftdebug.h */
+
+  FT_BASE_DEF( void )
+  FT_Trace_Enable( void )
+  {
+    ft_trace_levels = ft_trace_levels_enabled;
+  }
+
+
+  /**************************************************************************
+   *
+   * Initialize the tracing sub-system.  This is done by retrieving the
+   * value of the `FT2_DEBUG' environment variable.  It must be a list of
+   * toggles, separated by spaces, `;', or `,'.  Example:
+   *
+   *   export FT2_DEBUG="any:3 memory:7 stream:5"
+   *
+   * This requests that all levels be set to 3, except the trace level for
+   * the memory and stream components which are set to 7 and 5,
+   * respectively.
+   *
+   * See the file `include/freetype/internal/fttrace.h' for details of
+   * the available toggle names.
+   *
+   * The level must be between 0 and 7; 0 means quiet (except for serious
+   * runtime errors), and 7 means _very_ verbose.
+   */
+  FT_BASE_DEF( void )
+  ft_debug_init( void )
+  {
+    /* const char*  ft2_debug = ft_getenv( "FT2_DEBUG" ); */
+    char         buf[256];
+    const char*  ft2_debug = &buf[0];
+
+
+    /* if ( ft2_debug ) */
+    if ( GetVar( "FT2_DEBUG", (STRPTR)ft2_debug, 256, LV_VAR ) > 0 )
+    {
+      const char*  p = ft2_debug;
+      const char*  q;
+
+
+      for ( ; *p; p++ )
+      {
+        /* skip leading whitespace and separators */
+        if ( *p == ' ' || *p == '\t' || *p == ',' || *p == ';' || *p == '=' )
+          continue;
+
+        /* read toggle name, followed by ':' */
+        q = p;
+        while ( *p && *p != ':' )
+          p++;
+
+        if ( !*p )
+          break;
+
+        if ( *p == ':' && p > q )
+        {
+          FT_Int  n, i, len = (FT_Int)( p - q );
+          FT_Int  level = -1, found = -1;
+
+
+          for ( n = 0; n < trace_count; n++ )
+          {
+            const char*  toggle = ft_trace_toggles[n];
+
+
+            for ( i = 0; i < len; i++ )
+            {
+              if ( toggle[i] != q[i] )
+                break;
+            }
+
+            if ( i == len && toggle[i] == 0 )
+            {
+              found = n;
+              break;
+            }
+          }
+
+          /* read level */
+          p++;
+          if ( *p )
+          {
+            level = *p - '0';
+            if ( level < 0 || level > 7 )
+              level = -1;
+          }
+
+          if ( found >= 0 && level >= 0 )
+          {
+            if ( found == trace_any )
+            {
+              /* special case for `any' */
+              for ( n = 0; n < trace_count; n++ )
+                ft_trace_levels_enabled[n] = level;
+            }
+            else
+              ft_trace_levels_enabled[found] = level;
+          }
+        }
+      }
+    }
+
+    ft_trace_levels = ft_trace_levels_enabled;
+  }
+
+
+#else  /* !FT_DEBUG_LEVEL_TRACE */
+
+
+  FT_BASE_DEF( void )
+  ft_debug_init( void )
+  {
+    /* nothing */
+  }
+
+
+  FT_BASE_DEF( FT_Int )
+  FT_Trace_Get_Count( void )
+  {
+    return 0;
+  }
+
+
+  FT_BASE_DEF( const char * )
+  FT_Trace_Get_Name( FT_Int  idx )
+  {
+    FT_UNUSED( idx );
+
+    return NULL;
+  }
+
+
+  FT_BASE_DEF( void )
+  FT_Trace_Disable( void )
+  {
+    /* nothing */
+  }
+
+
+  /* documentation is in ftdebug.h */
+
+  FT_BASE_DEF( void )
+  FT_Trace_Enable( void )
+  {
+    /* nothing */
+  }
+
+
+#endif /* !FT_DEBUG_LEVEL_TRACE */
+
+
+/* END */