Simplified and focus on msc, msc_vc140

This commit is contained in:
2019-02-20 14:28:00 +01:00
parent 48be270648
commit 97f0a1d2aa
11 changed files with 145 additions and 108 deletions
+23 -6
View File
@@ -35,16 +35,33 @@ iff not defined DEFAULT_ISE_SVN then
set DEFAULT_ISE_SVN=svn://%USERNAME%@svn.ise/ise_svn/trunk
endiff
iff not defined ISE_VC_MSC then
set ISE_VC_MSC=VC110
endiff
iff not defined ISE_VC_MSC_VC140 then
set ISE_VC_MSC_VC140=VC140
endiff
iff not defined ISE_C_COMPILER then
REM set ISE_C_COMPILER=msc_vc140
set ISE_C_COMPILER=msc
iff defined ISE_VC_MSC_VC140 then
set ISE_C_COMPILER=msc_vc140
set ISE_C_COMPILER_VER=%ISE_VC_MSC_VC140%
else
iff defined ISE_VC_MSC then
set ISE_C_COMPILER=msc
set ISE_C_COMPILER_VER=%ISE_VC_MSC%
endiff
endiff
endiff
iff not defined ISE_C_COMPILER_VER then
REM set ISE_C_COMPILER_VER=WSDK71
REM set ISE_C_COMPILER_VER=VC150
REM set ISE_C_COMPILER_VER=VC140
set ISE_C_COMPILER_VER=VC100
if "%ISE_C_COMPILER%" == "msc_vc140" (
set ISE_C_COMPILER_VER=%ISE_VC_MSC_VC140%
) else (
if "%HAS_VC_MSC%" == "True" (
set ISE_C_COMPILER_VER=%ISE_VC_MSC%
)
)
endiff
iff not defined ISE_NIGHTLY_SCP_HOST then