diff --git a/scripts/win_wrapper.cmd b/scripts/win_wrapper.cmd index 80d2dfc..4c981b7 100644 --- a/scripts/win_wrapper.cmd +++ b/scripts/win_wrapper.cmd @@ -31,30 +31,31 @@ SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2% IF %MAJOR_PYTHON_VERSION% == 2 ( SET WINDOWS_SDK_VERSION="v7.0" SET SET_SDK_64=Y -) ELSE ( - IF %MAJOR_PYTHON_VERSION% == 3 ( - SET WINDOWS_SDK_VERSION="v7.1" - IF %MINOR_PYTHON_VERSION% LEQ 4 ( - SET SET_SDK_64=Y - ) ELSE ( - SET SET_SDK_64=N - IF EXIST "%WIN_WDK%" ( - :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/ - REN "%WIN_WDK%" 0wdf - ) - ) +) +IF %MAJOR_PYTHON_VERSION% == 3 ( + SET WINDOWS_SDK_VERSION="v7.1" + IF %MINOR_PYTHON_VERSION% LEQ 4 ( + SET SET_SDK_64=Y ) ELSE ( - ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%" - EXIT 1 + SET SET_SDK_64=N ) ) +ECHO Python: -->%MAJOR_PYTHON_VERSION%<-- -->%MINOR_PYTHON_VERSION%<-- +ECHO SDK -->%WINDOWS_SDK_VERSION%<-- 64? -->SET_SDK_64<-- + IF %PYTHON_ARCH% == 64 ( IF %SET_SDK_64% == Y ( SET DISTUTILS_USE_SDK=1 SET MSSdk=1 "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION% "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release + ) ELSE ( + IF EXIST "%WIN_WDK%" ( + :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/ + REN "%WIN_WDK%" 0wdf + ) ) ) + call %COMMAND_TO_RUN% || EXIT 1