File tree 2 files changed +6
-6
lines changed 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
3
3
echo before_install...
4
-
5
- choco install visualstudio2017community visualstudio2017-workload-nativedesktop
Original file line number Diff line number Diff line change @@ -25,14 +25,16 @@ if [ ! -f $DIR/Dependencies/premake/bin/release/premake5 ]; then
25
25
else
26
26
27
27
VSINSTALL=` " /c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -property installationPath`
28
+ VSVERSION=` " /c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -property catalog_productLineVersion`
29
+
28
30
if [ -z " $VSINSTALL " ]; then
29
31
VSINSTALL=` " /c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -products ' Microsoft.VisualStudio.Product.BuildTools' -property installationPath`
32
+ VSVERSION=` " /c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -products ' Microsoft.VisualStudio.Product.BuildTools' -property catalog_productLineVersion`
30
33
fi
31
- echo $VSINSTALL
32
- VSINSTALL_BASH=` cygpath -a " $VSINSTALL " `
33
- echo $VSINSTALL_BASH
34
+
34
35
echo Calling premake bootstrap...
35
- cmd //c " $VSINSTALL_BASH /VC/Auxiliary/Build/vcvars64.bat" \&\& nmake -f Bootstrap.mak windows
36
+ VSINSTALL_BASH=` cygpath -a " $VSINSTALL " `
37
+ cmd //c " $VSINSTALL_BASH /VC/Auxiliary/Build/vcvars64.bat" \&\& nmake -f Bootstrap.mak MSDEV=vs$VSVERSION windows-msbuild
36
38
if [ " $? " -ne " 0" ]; then
37
39
exit 1
38
40
fi
You can’t perform that action at this time.
0 commit comments