diff --git a/ini/windows/bin/sc.ini b/ini/windows/bin/sc.ini index 7b8814035a95..c4f81553f196 100644 --- a/ini/windows/bin/sc.ini +++ b/ini/windows/bin/sc.ini @@ -46,14 +46,18 @@ LINKCMD=%VCINSTALLDIR%\bin\link.exe ; Windows installer replaces the following lines with the actual paths ;VCINSTALLDIR= ;WindowsSdkDir= +;UniversalCRTSdkDir= +;UCRTVersion= ; Windows installer uncomments the version detected +;VC2015 LINKCMD=%VCINSTALLDIR%\bin\x86_amd64\link.exe ;VC2013 LINKCMD=%VCINSTALLDIR%\bin\x86_amd64\link.exe ;VC2012 LINKCMD=%VCINSTALLDIR%\bin\x86_amd64\link.exe ;VC2010 LINKCMD=%VCINSTALLDIR%\bin\amd64\link.exe ;VC2008 LINKCMD=%VCINSTALLDIR%\bin\amd64\link.exe ; needed with /DEBUG to find mspdb*.dll (only for VS2012 or VS2013) +;VC2015 PATH=%PATH%;%VCINSTALLDIR%\bin\x86_amd64;%VCINSTALLDIR%\bin ;VC2013 PATH=%PATH%;%VCINSTALLDIR%\bin\x86_amd64;%VCINSTALLDIR%\..\Common7\IDE;%VCINSTALLDIR%\bin ;VC2012 PATH=%PATH%;%VCINSTALLDIR%\bin\x86_amd64;%VCINSTALLDIR%\..\Common7\IDE @@ -66,6 +70,10 @@ LINKCMD=%VCINSTALLDIR%\bin\link.exe ; C Runtime libraries LIB=%LIB%;"%VCINSTALLDIR%\lib\amd64" +; Platform/UCRT libraries (Windows SDK 10.0) +LIB=%LIB%;"%UniversalCRTSdkDir%\Lib\%UCRTVersion%\um\x64" +LIB=%LIB%;"%UniversalCRTSdkDir%\Lib\%UCRTVersion%\ucrt\x64" + ; Platform libraries (Windows SDK 8.1) LIB=%LIB%;"%WindowsSdkDir%\Lib\winv6.3\um\x64" @@ -91,10 +99,13 @@ DFLAGS=%DFLAGS% -L/OPT:NOICF ; Windows installer replaces the following lines with the actual paths ;VCINSTALLDIR= ;WindowsSdkDir= +;UniversalCRTSdkDir= +;UCRTVersion= LINKCMD=%VCINSTALLDIR%\bin\link.exe ; needed with /DEBUG to find mspdb*.dll (only for VS2012 or VS2013) +;VC2015 PATH=%PATH%;%VCINSTALLDIR%\bin ;VC2013 PATH=%PATH%;%VCINSTALLDIR%\..\Common7\IDE;%VCINSTALLDIR%\bin ;VC2012 PATH=%PATH%;%VCINSTALLDIR%\..\Common7\IDE @@ -105,6 +116,10 @@ LINKCMD=%VCINSTALLDIR%\bin\link.exe ; C Runtime libraries LIB=%LIB%;"%VCINSTALLDIR%\lib" +; Platform/UCRT libraries (Windows SDK 10.0) +LIB=%LIB%;"%UniversalCRTSdkDir%\Lib\%UCRTVersion%\um\x86" +LIB=%LIB%;"%UniversalCRTSdkDir%\Lib\%UCRTVersion%\ucrt\x86" + ; Platform libraries (Windows SDK 8.1) LIB=%LIB%;"%WindowsSdkDir%\Lib\winv6.3\um\x86"