diff --git a/docs/building.md b/docs/building.md index 4dfc896fa..c2e605a96 100644 --- a/docs/building.md +++ b/docs/building.md @@ -8,10 +8,9 @@ drivers. ### Windows -* Windows 7 or later +* Windows 10 or later * [Visual Studio 2022, Visual Studio 2019, or Visual Studio 2017](https://www.visualstudio.com/downloads/) - * For Visual Studio 2022, MSBuild `v142` must be used due to a compiler bug; See [#2003](https://github.com/xenia-project/xenia/issues/2003). -* [Python 3.6+](https://www.python.org/downloads/) +* [Python 3.8+](https://www.python.org/downloads/) * Ensure Python is in PATH. * Windows 11 SDK version 10.0.22000.0 (for Visual Studio 2019, this or any newer version) diff --git a/xb.bat b/xb.bat index 458d516d8..7f37d9a40 100644 --- a/xb.bat +++ b/xb.bat @@ -8,7 +8,7 @@ REM Environment Validation REM ============================================================================ SET "PYTHON_MINIMUM_VERSION[0]=3" -SET "PYTHON_MINIMUM_VERSION[1]=6" +SET "PYTHON_MINIMUM_VERSION[1]=8" CALL :check_python IF %_RESULT% NEQ 0 ( ECHO. @@ -35,13 +35,14 @@ SETLOCAL ENABLEDELAYEDEXPANSION SET FOUND_PATH="" -SET "CANDIDATE_PATHS[0]=C:\python310\python.exe" -SET "CANDIDATE_PATHS[1]=C:\python39\python.exe" -SET "CANDIDATE_PATHS[2]=C:\python38\python.exe" -SET "CANDIDATE_PATHS[3]=C:\python37\python.exe" -SET "CANDIDATE_PATHS[4]=C:\python%PYTHON_MINIMUM_VERSION[0]%%PYTHON_MINIMUM_VERSION[1]%\python.exe" -SET "CANDIDATE_PATHS[5]=C:\Windows\py.exe" -SET OUTPUT_INDEX=6 +SET "CANDIDATE_PATHS[0]=C:\python313\python.exe" +SET "CANDIDATE_PATHS[1]=C:\python312\python.exe" +SET "CANDIDATE_PATHS[2]=C:\python311\python.exe" +SET "CANDIDATE_PATHS[3]=C:\python310\python.exe" +SET "CANDIDATE_PATHS[4]=C:\python39\python.exe" +SET "CANDIDATE_PATHS[5]=C:\python%PYTHON_MINIMUM_VERSION[0]%%PYTHON_MINIMUM_VERSION[1]%\python.exe" +SET "CANDIDATE_PATHS[6]=C:\Windows\py.exe" +SET OUTPUT_INDEX=7 FOR /F "usebackq delims=" %%L IN (`2^>NUL where python3`) DO ( IF %%~zL NEQ 0 ( diff --git a/xb.ps1 b/xb.ps1 index 0b58cc309..6f6d637e4 100644 --- a/xb.ps1 +++ b/xb.ps1 @@ -14,7 +14,7 @@ foreach ($pythonExecutable in $pythonExecutables) { } } # Neither found, error and exit -$pythonMinimumVer = 3,6 +$pythonMinimumVer = 3,8 if (!$pythonPath) { Write-FatalError "ERROR: Python $($pythonMinimumVer[0]).$($pythonMinimumVer[1])+ must be installed and on PATH:`nhttps://www.python.org/" } diff --git a/xenia-build b/xenia-build index 0bdbd2004..03c912933 100755 --- a/xenia-build +++ b/xenia-build @@ -137,7 +137,7 @@ def main(): print('') # Check python version. - python_minimum_ver=3,6 + python_minimum_ver=3,8 if not sys.version_info[:2] >= (python_minimum_ver[0], python_minimum_ver[1]): print('ERROR: Python ', python_minimum_ver[0], '.', python_minimum_ver[1], '+ must be installed and on PATH', sep='') sys.exit(1)