mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 06:06:10 -04:00
Updated Windows build to opencv-3.2.0
This commit is contained in:
parent
ff5f3df1ac
commit
1eb22f88a9
4 changed files with 16 additions and 10 deletions
|
@ -24,8 +24,7 @@ call "%EnvPath%\env-msys.bat"
|
|||
if errorlevel 1 goto error_env
|
||||
|
||||
:: Check MSYS environment
|
||||
set MSYSSH=%EnvMSYSPath%\msys\1.0\bin\sh.exe
|
||||
if not exist "%MSYSSH%" %cecho% error "Please install MSYS first." & exit /B 1
|
||||
if not exist "%EnvMSYSSH%" %cecho% error "Please install MSYS first." & exit /B 1
|
||||
|
||||
:: Initialize environment
|
||||
call "%~dp0env.bat"
|
||||
|
@ -36,7 +35,7 @@ call "%ToolsPath%\msys-path.bat" "%BuildLibsPath%" MSYSBuildLibsPath
|
|||
|
||||
if not exist "%BuildLibsPath%" mkdir "%BuildLibsPath%"
|
||||
|
||||
"%MSYSSH%" --login -i -c "cd "%MSYSBuildLibsPath%" && make -f %MSYSCurPath%/makefile %MakeParam% %MakeTask%"
|
||||
%EnvMSYSCmd% "cd "%MSYSBuildLibsPath%" && make -f %MSYSCurPath%/makefile %MakeParam% %MakeTask%"
|
||||
|
||||
exit /B %ERRORLEVEL%
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue