publish changes

Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Autotools.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: arch-latest
     defaults:
       run:
         shell: msys2 {0}

Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Makefile.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: arch-latest
     defaults:
       run:
         shell: msys2 {0}

Src/external_dependencies/openmpt-trunk/Makefile

@@ -242,7 +242,7 @@ NUMTHREADS:=$(shell nproc)
 
 else ifeq ($(OS),Windows_NT)
 
-HOST=windows
+HOST=arch
 HOST_FLAVOUR=
 
 TOOLCHAIN_SUFFIX=

Src/external_dependencies/openmpt-trunk/README.md

@@ -64,7 +64,7 @@ How to compile
     installed with later Visual Studio versions.
 
     The Windows 8.1 SDK is available from
-    <https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/> or
+    <https://developer.microsoft.com/en-us/arch/downloads/sdk-archive/> or
     directly from
     <https://download.microsoft.com/download/B/0/C/B0C80BA3-8AD6-4958-810B-6882485230B5/standalonesdk/sdksetup.exe>
     .

Src/external_dependencies/openmpt-trunk/build/auto/cppcheck_openmpt.sh

@@ -32,6 +32,6 @@ NPROC=$(nproc)
 echo "Platform: $CPPCHECK_PLATFORM"
 
 echo "Checking config ..."
-cppcheck -j $NPROC -DCPPCHECK -DMPT_CPPCHECK_CUSTOM $CPPCHECK_PLATFORM --std=c99 --std=c++17 --library=windows.cfg --library=microsoft_atl.cfg --library=mfc.cfg --library=build/cppcheck/nlohmann-json.cfg --suppressions-list=build/cppcheck/nlohmann-json.suppressions.txt --suppressions-list=build/cppcheck/r8brain.suppressions.txt --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' --suppress=missingIncludeSystem --suppress=uninitMemberVar $CPPCHECK_OPTIONS $CPPCHECK_DEFINES $CPPCHECK_INCLUDES --check-config --suppress=unmatchedSuppression $CPPCHECK_FILES
+cppcheck -j $NPROC -DCPPCHECK -DMPT_CPPCHECK_CUSTOM $CPPCHECK_PLATFORM --std=c99 --std=c++17 --library=arch.cfg --library=microsoft_atl.cfg --library=mfc.cfg --library=build/cppcheck/nlohmann-json.cfg --suppressions-list=build/cppcheck/nlohmann-json.suppressions.txt --suppressions-list=build/cppcheck/r8brain.suppressions.txt --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' --suppress=missingIncludeSystem --suppress=uninitMemberVar $CPPCHECK_OPTIONS $CPPCHECK_DEFINES $CPPCHECK_INCLUDES --check-config --suppress=unmatchedSuppression $CPPCHECK_FILES
 echo "Checking C++ ..."
-cppcheck -j $NPROC -DCPPCHECK -DMPT_CPPCHECK_CUSTOM $CPPCHECK_PLATFORM --std=c99 --std=c++17 --library=windows.cfg --library=microsoft_atl.cfg --library=mfc.cfg --library=build/cppcheck/nlohmann-json.cfg --suppressions-list=build/cppcheck/nlohmann-json.suppressions.txt --suppressions-list=build/cppcheck/r8brain.suppressions.txt --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' --suppress=missingIncludeSystem --suppress=uninitMemberVar $CPPCHECK_OPTIONS $CPPCHECK_DEFINES $CPPCHECK_INCLUDES $CPPCHECK_FILES
+cppcheck -j $NPROC -DCPPCHECK -DMPT_CPPCHECK_CUSTOM $CPPCHECK_PLATFORM --std=c99 --std=c++17 --library=arch.cfg --library=microsoft_atl.cfg --library=mfc.cfg --library=build/cppcheck/nlohmann-json.cfg --suppressions-list=build/cppcheck/nlohmann-json.suppressions.txt --suppressions-list=build/cppcheck/r8brain.suppressions.txt --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' --suppress=missingIncludeSystem --suppress=uninitMemberVar $CPPCHECK_OPTIONS $CPPCHECK_DEFINES $CPPCHECK_INCLUDES $CPPCHECK_FILES

Src/external_dependencies/openmpt-trunk/build/auto/package_libopenmpt_multi_args.cmd

@@ -26,13 +26,13 @@ set MPT_PKG_TAG=%MPT_DIST_VARIANT_OS%
 cd bin || goto error
 rmdir /s /q libopenmpt
 mkdir libopenmpt || goto error
-mkdir libopenmpt\bin.windows
-mkdir libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%
-rmdir /s /q libopenmpt-windows
-del /f /q libopenmpt-windows.tar
-del /f /q libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT%
-mkdir libopenmpt-windows
-cd libopenmpt-windows || goto error
+mkdir libopenmpt\bin.arch
+mkdir libopenmpt\bin.arch\%LIBOPENMPT_VERSION_STRING%
+rmdir /s /q libopenmpt-arch
+del /f /q libopenmpt-arch.tar
+del /f /q libopenmpt-%MPT_REVISION%.bin.arch.%MPT_PKG_FORMAT%
+mkdir libopenmpt-arch
+cd libopenmpt-arch || goto error
 mkdir openmpt123
 mkdir openmpt123\x86
 mkdir openmpt123\amd64
@@ -102,7 +102,7 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\xmp-openmpt.dll .\XMPlay-
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\XMPlay-legacy\ || goto error
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\in_openmpt.dll .\Winamp-legacy\ || goto error
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\Winamp-legacy\ || goto error
-..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% ^
+..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.arch\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.arch.%MPT_PKG_FORMAT% ^
  LICENSE.txt ^
  Licenses ^
  changelog.md ^
@@ -132,22 +132,22 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\Wina
  Winamp-legacy\openmpt-mpg123.dll ^
  || goto error
 cd .. || goto error
-rmdir /s /q libopenmpt-windows
-..\build\tools\7zip\7z.exe a -r -ttar libopenmpt-windows.tar libopenmpt || goto error
-del /f /q libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT%
+rmdir /s /q libopenmpt-arch
+..\build\tools\7zip\7z.exe a -r -ttar libopenmpt-arch.tar libopenmpt || goto error
+del /f /q libopenmpt\bin.arch\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.arch.%MPT_PKG_FORMAT%
 rmdir /s /q libopenmpt
 cd .. || goto error
 
 cd bin || goto error
 rmdir /s /q libopenmpt
 mkdir libopenmpt || goto error
-mkdir libopenmpt\dev.windows.%MPT_VS_VER%
-mkdir libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%
-rmdir /s /q libopenmpt-dev-windows-%MPT_VS_VER%
-del /f /q libopenmpt-dev-windows-%MPT_VS_VER%.tar
-del /f /q libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT%
-mkdir libopenmpt-dev-windows-%MPT_VS_VER%
-cd libopenmpt-dev-windows-%MPT_VS_VER% || goto error
+mkdir libopenmpt\dev.arch.%MPT_VS_VER%
+mkdir libopenmpt\dev.arch.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%
+rmdir /s /q libopenmpt-dev-arch-%MPT_VS_VER%
+del /f /q libopenmpt-dev-arch-%MPT_VS_VER%.tar
+del /f /q libopenmpt-%MPT_REVISION%.dev.arch.%MPT_VS_VER%.%MPT_PKG_FORMAT%
+mkdir libopenmpt-dev-arch-%MPT_VS_VER%
+cd libopenmpt-dev-arch-%MPT_VS_VER% || goto error
 mkdir inc
 mkdir inc\libopenmpt
 mkdir lib
@@ -243,7 +243,7 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-mpg123.dll bin\
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-ogg.dll bin\amd64-legacy\ || goto error
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-vorbis.dll bin\amd64-legacy\ || goto error
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-zlib.dll bin\amd64-legacy\ || goto error
-..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^
+..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.arch.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.arch.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^
  LICENSE.txt ^
  Licenses ^
  changelog.md ^
@@ -294,9 +294,9 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-zlib.dll bin\am
  bin\amd64-legacy\openmpt-zlib.dll ^
  || goto error
 cd .. || goto error
-rmdir /s /q libopenmpt-dev-windows-%MPT_VS_VER%
-..\build\tools\7zip\7z.exe a -r -ttar libopenmpt-dev-windows-%MPT_VS_VER%.tar libopenmpt || goto error
-del /f /q libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT%
+rmdir /s /q libopenmpt-dev-arch-%MPT_VS_VER%
+..\build\tools\7zip\7z.exe a -r -ttar libopenmpt-dev-arch-%MPT_VS_VER%.tar libopenmpt || goto error
+del /f /q libopenmpt\dev.arch.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.arch.%MPT_VS_VER%.%MPT_PKG_FORMAT%
 rmdir /s /q libopenmpt
 cd .. || goto error
 

Src/external_dependencies/openmpt-trunk/build/autotools/Makefile.am

@@ -154,7 +154,7 @@ MPT_FILES_SRC_MPT += src/mpt/binary/base64url.hpp
 MPT_FILES_SRC_MPT += src/mpt/binary/hex.hpp
 MPT_FILES_SRC_MPT += src/mpt/check/libc.hpp
 MPT_FILES_SRC_MPT += src/mpt/check/mfc.hpp
-MPT_FILES_SRC_MPT += src/mpt/check/windows.hpp
+MPT_FILES_SRC_MPT += src/mpt/check/arch.hpp
 MPT_FILES_SRC_MPT += src/mpt/crc/crc.hpp
 #MPT_FILES_SRC_MPT += src/mpt/crypto/exception.hpp
 #MPT_FILES_SRC_MPT += src/mpt/crypto/hash.hpp
@@ -206,7 +206,7 @@ MPT_FILES_SRC_MPT += src/mpt/io_write/buffer.hpp
 #MPT_FILES_SRC_MPT += src/mpt/library/library.hpp
 MPT_FILES_SRC_MPT += src/mpt/mutex/mutex.hpp
 MPT_FILES_SRC_MPT += src/mpt/osinfo/class.hpp
-MPT_FILES_SRC_MPT += src/mpt/osinfo/windows_version.hpp
+MPT_FILES_SRC_MPT += src/mpt/osinfo/arch_version.hpp
 MPT_FILES_SRC_MPT += src/mpt/out_of_memory/out_of_memory.hpp
 MPT_FILES_SRC_MPT += src/mpt/parse/parse.hpp
 #MPT_FILES_SRC_MPT += src/mpt/path/path.hpp

Src/external_dependencies/openmpt-trunk/build/build_tools.cmd

@@ -62,7 +62,7 @@ copy /y include\genie\OpenMPT.txt include\genie\OpenMPT-version.txt
 if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" (
  call build\auto\setup_vs2019.cmd || goto error
  rem cd include\premake || goto error
- rem  nmake -f Bootstrap.mak windows MSDEV=vs2019 || goto error
+ rem  nmake -f Bootstrap.mak arch MSDEV=vs2019 || goto error
  rem  bin\release\premake5 embed --bytecode || goto error
  rem  bin\release\premake5 --to=build/vs2019 vs2019 --no-curl --no-zlib --no-luasocket || goto error
  rem cd ..\.. || goto error
@@ -75,7 +75,7 @@ if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxil
 if exist "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" (
  call build\auto\setup_vs2019.cmd || goto error
  rem cd include\premake || goto error
- rem  nmake -f Bootstrap.mak windows MSDEV=vs2019 || goto error
+ rem  nmake -f Bootstrap.mak arch MSDEV=vs2019 || goto error
  rem  bin\release\premake5 embed --bytecode || goto error
  rem  bin\release\premake5 --to=build/vs2019 vs2019 --no-curl --no-zlib --no-luasocket || goto error
  rem cd ..\.. || goto error
@@ -88,7 +88,7 @@ if exist "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\B
 if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" (
  call build\auto\setup_vs2017.cmd || goto error
  rem cd include\premake || goto error
- rem  nmake -f Bootstrap.mak windows MSDEV=vs2017 || goto error
+ rem  nmake -f Bootstrap.mak arch MSDEV=vs2017 || goto error
  rem  bin\release\premake5 embed --bytecode || goto error
  rem  bin\release\premake5 --to=build/vs2017 vs2017 --no-curl --no-zlib --no-luasocket || goto error
  rem cd ..\.. || goto error
@@ -101,7 +101,7 @@ if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxil
 if exist "C:\Program Files\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" (
  call build\auto\setup_vs2017.cmd || goto error
  rem cd include\premake || goto error
- rem  nmake -f Bootstrap.mak windows MSDEV=vs2017 || goto error
+ rem  nmake -f Bootstrap.mak arch MSDEV=vs2017 || goto error
  rem  bin\release\premake5 embed --bytecode || goto error
  rem  bin\release\premake5 --to=build/vs2017 vs2017 --no-curl --no-zlib --no-luasocket || goto error
  rem cd ..\.. || goto error

Src/external_dependencies/openmpt-trunk/build/genie/genie-defaults.lua

@@ -102,8 +102,8 @@
 			defines { "_WIN32_WINNT=0x0603" }
 			premake.vstudio.storeapp = "8.2"
 			local action = premake.action.current()
-			action.vstudio.windowsTargetPlatformVersion = "10.0.10240.0"
-			action.vstudio.windowsTargetPlatformMinVersion = "10.0.10240.0"
+			action.vstudio.archTargetPlatformVersion = "10.0.10240.0"
+			action.vstudio.archTargetPlatformMinVersion = "10.0.10240.0"
 
 		elseif _OPTIONS["target"] == "winstore10" then
 			defines { "_WIN32_WINNT=0x0A00" }

Src/external_dependencies/openmpt-trunk/build/genie/genie.lua

@@ -17,7 +17,7 @@ newoption {
 newoption {
  trigger     = "target",
  value       = "PROJECTS",
- description = "windows target platform",
+ description = "arch target platform",
  allowed = {
   { "windesktop81", "windesktop81" },
   { "winphone8"   , "winphone8"  },

Src/external_dependencies/openmpt-trunk/build/pch/PCH.h

@@ -32,8 +32,8 @@
 
 #if defined(MODPLUG_TRACKER)
 #if MPT_OS_WINDOWS
-#include <windows.h>
-#include <windowsx.h>
+#include <arch.h>
+#include <archx.h>
 #include <shlwapi.h>
 #include <mmsystem.h>
 #endif // MPT_OS_WINDOWS

Src/external_dependencies/openmpt-trunk/build/premake/ext-flac.lua

@@ -54,7 +54,7 @@
    "../../include/flac/src/libFLAC/stream_encoder_intrin_ssse3.c",
    "../../include/flac/src/libFLAC/stream_encoder_framing.c",
    "../../include/flac/src/libFLAC/window.c",
-   "../../include/flac/src/libFLAC/windows_unicode_filenames.c",
+   "../../include/flac/src/libFLAC/arch_unicode_filenames.c",
   }
   files {
    "../../include/flac/src/libFLAC/include/private/all.h",
@@ -108,7 +108,7 @@
   filter { "action:vs*" }
     files {
      "../../include/flac/include/share/win_utf8_io.h",
-     "../../include/flac/include/share/windows_unicode_filenames.h",
+     "../../include/flac/include/share/arch_unicode_filenames.h",
     }
   filter {}
   filter { "action:vs*" }

Src/external_dependencies/openmpt-trunk/build/premake/mpt-PluginBridge.lua

@@ -135,9 +135,9 @@
 	filter { "action:vs*", "architecture:x86_64" }
 		dataexecutionprevention "Off"
 	filter { "action:vs*", "architecture:ARM" }
-		-- dataexecutionprevention "Off" -- not supported by windows loader on arm64
+		-- dataexecutionprevention "Off" -- not supported by arch loader on arm64
 	filter { "action:vs*", "architecture:ARM64" }
-		-- dataexecutionprevention "Off" -- not supported by windows loader on arm64
+		-- dataexecutionprevention "Off" -- not supported by arch loader on arm64
 	filter {}
   characterset "Unicode"
   warnings "Extra"

Src/external_dependencies/openmpt-trunk/build/regenerate_vs_projects.cmd

@@ -12,7 +12,7 @@ if exist "include\premake\premake5.exe" set PREMAKE=include\premake\premake5.exe
 if exist "include\premake\bin\release\premake5.exe" set PREMAKE=include\premake\bin\release\premake5.exe
 
 set GENIE=
-set GENIE=include\genie\bin\windows\genie.exe
+set GENIE=include\genie\bin\arch\genie.exe
 
 
 

Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj

@@ -759,7 +759,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp">
@@ -831,7 +831,7 @@
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj.filters

@@ -315,7 +315,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -495,7 +495,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj

@@ -1754,7 +1754,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1814,7 +1814,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj

@@ -1306,7 +1306,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1366,7 +1366,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj.filters

@@ -462,7 +462,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -642,7 +642,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj

@@ -1754,7 +1754,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1814,7 +1814,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj

@@ -1754,7 +1754,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1814,7 +1814,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj

@@ -1433,7 +1433,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1493,7 +1493,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj.filters

@@ -318,7 +318,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -498,7 +498,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj

@@ -1433,7 +1433,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1493,7 +1493,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj.filters

@@ -318,7 +318,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -498,7 +498,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj

@@ -1370,7 +1370,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -1424,7 +1424,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj.filters

@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -783,7 +783,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj

@@ -1370,7 +1370,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -1424,7 +1424,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj.filters

@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -783,7 +783,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj

@@ -1322,7 +1322,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -1376,7 +1376,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj.filters

@@ -627,7 +627,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -789,7 +789,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj

@@ -1267,7 +1267,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1327,7 +1327,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj.filters

@@ -402,7 +402,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -582,7 +582,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj

@@ -1010,7 +1010,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1070,7 +1070,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj

@@ -694,7 +694,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -754,7 +754,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj.filters

@@ -462,7 +462,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -642,7 +642,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj

@@ -1010,7 +1010,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1070,7 +1070,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj

@@ -1010,7 +1010,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1070,7 +1070,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj

@@ -737,7 +737,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -797,7 +797,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj.filters

@@ -318,7 +318,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -498,7 +498,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj

@@ -743,7 +743,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -803,7 +803,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj.filters

@@ -318,7 +318,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -498,7 +498,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj

@@ -758,7 +758,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -812,7 +812,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj.filters

@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -783,7 +783,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj

@@ -758,7 +758,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -812,7 +812,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj.filters

@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -783,7 +783,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj

@@ -734,7 +734,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -788,7 +788,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj.filters

@@ -627,7 +627,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -789,7 +789,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj

@@ -667,7 +667,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -727,7 +727,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj.filters

@@ -402,7 +402,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -582,7 +582,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj

@@ -1399,7 +1399,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -1453,7 +1453,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj.filters

@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -783,7 +783,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj

@@ -1399,7 +1399,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -1453,7 +1453,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj.filters

@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -783,7 +783,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj

@@ -1753,7 +1753,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1813,7 +1813,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj

@@ -1305,7 +1305,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1365,7 +1365,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters

@@ -462,7 +462,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -642,7 +642,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj

@@ -1753,7 +1753,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1813,7 +1813,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj

@@ -1753,7 +1753,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1813,7 +1813,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj

@@ -1432,7 +1432,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1492,7 +1492,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj.filters

@@ -318,7 +318,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -498,7 +498,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj

@@ -1432,7 +1432,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1492,7 +1492,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters

@@ -318,7 +318,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -498,7 +498,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-mpg123.vcxproj

@@ -92,26 +92,26 @@
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
     <VcpkgConfiguration>Debug</VcpkgConfiguration>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
     <VcpkgConfiguration>Debug</VcpkgConfiguration>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-ogg.vcxproj

@@ -101,25 +101,25 @@
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudio.vcxproj

@@ -97,25 +97,25 @@
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudiocpp.vcxproj

@@ -96,25 +96,25 @@
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-vorbis.vcxproj

@@ -101,25 +101,25 @@
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj

@@ -1369,7 +1369,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -1423,7 +1423,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj.filters

@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -783,7 +783,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj

@@ -546,7 +546,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -600,7 +600,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj.filters

@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -783,7 +783,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_modplug.vcxproj

@@ -100,25 +100,25 @@
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj

@@ -1321,7 +1321,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -1375,7 +1375,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj.filters

@@ -627,7 +627,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -789,7 +789,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj

@@ -1266,7 +1266,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1326,7 +1326,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj.filters

@@ -402,7 +402,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -582,7 +582,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj

@@ -1021,7 +1021,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1081,7 +1081,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj

@@ -705,7 +705,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -765,7 +765,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters

@@ -462,7 +462,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -642,7 +642,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj

@@ -1021,7 +1021,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1081,7 +1081,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj

@@ -1021,7 +1021,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -1081,7 +1081,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj.filters

@@ -1053,7 +1053,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -1233,7 +1233,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj

@@ -748,7 +748,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -808,7 +808,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj.filters

@@ -318,7 +318,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -498,7 +498,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj

@@ -754,7 +754,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crypto\exception.hpp" />
@@ -814,7 +814,7 @@
     <ClInclude Include="..\..\src\mpt\library\library.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj.filters

@@ -318,7 +318,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -498,7 +498,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">

Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj

@@ -769,7 +769,7 @@
     <ClInclude Include="..\..\src\mpt\binary\tests\tests_binary.hpp" />
     <ClInclude Include="..\..\src\mpt\check\libc.hpp" />
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp" />
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp" />
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp" />
     <ClInclude Include="..\..\src\mpt\crc\tests\tests_crc.hpp" />
     <ClInclude Include="..\..\src\mpt\detect\dl.hpp" />
@@ -823,7 +823,7 @@
     <ClInclude Include="..\..\src\mpt\io_write\buffer.hpp" />
     <ClInclude Include="..\..\src\mpt\mutex\mutex.hpp" />
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp" />
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp" />
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp" />
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\parse.hpp" />
     <ClInclude Include="..\..\src\mpt\parse\split.hpp" />

Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj.filters

@@ -621,7 +621,7 @@
     <ClInclude Include="..\..\src\mpt\check\mfc.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\check\windows.hpp">
+    <ClInclude Include="..\..\src\mpt\check\arch.hpp">
       <Filter>src\mpt\check</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\crc\crc.hpp">
@@ -783,7 +783,7 @@
     <ClInclude Include="..\..\src\mpt\osinfo\class.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\mpt\osinfo\windows_version.hpp">
+    <ClInclude Include="..\..\src\mpt\osinfo\arch_version.hpp">
       <Filter>src\mpt\osinfo</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\mpt\out_of_memory\out_of_memory.hpp">