|
|
|
@ -267,10 +267,10 @@ then
|
|
|
|
|
fi
|
|
|
|
|
condaexec="$path_conda/_conda.exe"
|
|
|
|
|
|
|
|
|
|
cd $path_lib
|
|
|
|
|
# cd $path_lib
|
|
|
|
|
# curl http://go.microsoft.com/fwlink/?LinkId=691126\&fixForIE=.exe. -o visualcppbuildtools_full.exe
|
|
|
|
|
wget -O visualcppbuildtools_full.exe http://go.microsoft.com/fwlink/?LinkId=691126\&fixForIE=.exe.
|
|
|
|
|
cmd //c "visualcppbuildtools_full.exe"
|
|
|
|
|
# wget -O visualcppbuildtools_full.exe http://go.microsoft.com/fwlink/?LinkId=691126\&fixForIE=.exe.
|
|
|
|
|
# cmd //c "visualcppbuildtools_full.exe"
|
|
|
|
|
|
|
|
|
|
### install zbar using apt-cyg
|
|
|
|
|
# installing apt-cyg
|
|
|
|
@ -318,9 +318,13 @@ echo "Now using python (t2): `which python`"
|
|
|
|
|
# . venv/bin/activate
|
|
|
|
|
echo "Now using python (t3): `which python`"
|
|
|
|
|
|
|
|
|
|
python -m pip install -r requirements.txt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$machine" = "MinGw" ]
|
|
|
|
|
then
|
|
|
|
|
env CC=/usr/bin/gcc python -m pip install -r requirements.txt
|
|
|
|
|
else
|
|
|
|
|
python -m pip install -r requirements.txt
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ "$machine" = "Mac" ]
|
|
|
|
|
then
|
|
|
|
|