diff --git a/build_scripts/Windows/build-libs/Makefile b/build_scripts/Windows/build-libs/Makefile index 5065d7620..93a845e82 100755 --- a/build_scripts/Windows/build-libs/Makefile +++ b/build_scripts/Windows/build-libs/Makefile @@ -4,7 +4,7 @@ MINIUPNPC_VERSION=2.0 OPENSSL_VERSION=1.0.2k SPEEX_VERSION=1.2rc2 SPEEXDSP_VERSION=1.2rc3 -OPENCV_VERSION=2.4.13 +OPENCV_VERSION=3.2.0 LIBXML2_VERSION=2.9.3 LIBXSLT_VERSION=1.1.28 CURL_VERSION=7.46.0 @@ -97,7 +97,7 @@ libs/miniupnpc-$(MINIUPNPC_VERSION): $(DOWNLOAD_PATH)/miniupnpc-$(MINIUPNPC_VERS rm -r -f libs/miniupnpc-* tar xvf $(DOWNLOAD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tar.gz # build - cd miniupnpc-$(MINIUPNPC_VERSION) && CC=gcc && export CC && make -f Makefile.mingw init libminiupnpc.a miniupnpc.dll + cd miniupnpc-$(MINIUPNPC_VERSION) && export CC=gcc && make -f Makefile.mingw init libminiupnpc.a miniupnpc.dll # copy files mkdir -p libs/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc cp miniupnpc-$(MINIUPNPC_VERSION)/*.h libs/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc/ @@ -178,7 +178,7 @@ libs/speexdsp-$(SPEEXDSP_VERSION): $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION) opencv: libs/opencv-$(OPENCV_VERSION) $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz: - wget --no-check-certificate https://github.com/Itseez/opencv/archive/$(OPENCV_VERSION).tar.gz -O $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz + wget --no-check-certificate https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).tar.gz -O $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz libs/opencv-$(OPENCV_VERSION): $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz # prepare @@ -285,7 +285,7 @@ libs/sqlcipher-$(SQLCIPHER_VERSION): $(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar. mkdir -p tcl$(TCL_VERSION)/lib ln -s `pwd`/tcl$(TCL_VERSION)/library `pwd`/tcl$(TCL_VERSION)/lib/tcl8.6 # build - cd sqlcipher-$(SQLCIPHER_VERSION) && PATH=.:$$PATH:`pwd`/../tcl$(TCL_VERSION)/build && LIBS="-L`pwd`/../libs/openssl-$(OPENSSL_VERSION)/lib -lgdi32 $$LIBS" && export LIBS && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC -I`pwd`/../libs/openssl-$(OPENSSL_VERSION)/include -I`pwd`/../tcl$(TCL_VERSION)/generic" LDFLAGS="-L`pwd`/../libs/openssl-$(OPENSSL_VERSION)/lib -lcrypto -lgdi32" --with-tcl="`pwd`/../tcl$(TCL_VERSION)/build" && make install prefix="`pwd`/install" + cd sqlcipher-$(SQLCIPHER_VERSION) && PATH=.:$$PATH:`pwd`/../tcl$(TCL_VERSION)/build && export LIBS="-L`pwd`/../libs/openssl-$(OPENSSL_VERSION)/lib -lgdi32 $$LIBS" && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC -I`pwd`/../libs/openssl-$(OPENSSL_VERSION)/include -I`pwd`/../tcl$(TCL_VERSION)/generic" LDFLAGS="-L`pwd`/../libs/openssl-$(OPENSSL_VERSION)/lib -lcrypto -lgdi32" --with-tcl="`pwd`/../tcl$(TCL_VERSION)/build" && make install prefix="`pwd`/install" # copy files mkdir -p libs/sqlcipher-$(SQLCIPHER_VERSION).tmp/include cp -r sqlcipher-$(SQLCIPHER_VERSION)/install/include/* libs/sqlcipher-$(SQLCIPHER_VERSION).tmp/include/ diff --git a/build_scripts/Windows/build-libs/build-libs.bat b/build_scripts/Windows/build-libs/build-libs.bat index 9dac5c8b5..58b400a2f 100644 --- a/build_scripts/Windows/build-libs/build-libs.bat +++ b/build_scripts/Windows/build-libs/build-libs.bat @@ -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% diff --git a/build_scripts/Windows/env/env-msys.bat b/build_scripts/Windows/env/env-msys.bat index 9b5421032..cc92f7495 100644 --- a/build_scripts/Windows/env/env-msys.bat +++ b/build_scripts/Windows/env/env-msys.bat @@ -8,7 +8,14 @@ if errorlevel 1 goto error_env set EnvMSYSPath=%EnvRootPath%\msys call "%~dp0tools\prepare-msys.bat" %1 -exit /B %ERRORLEVEL% +if errorlevel 1 exit /B %ERRORLEVEL% + +set EnvMSYSSH=%EnvMSYSPath%\msys\1.0\bin\sh.exe +if not exist "%EnvMSYSSH%" if errorlevel 1 goto error_env + +set EnvMSYSCmd="%EnvMSYSSH%" --login -i -c + +exit /B 0 :error_env echo Failed to initialize environment. diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index 5fac6b780..c178332a0 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -35,7 +35,7 @@ win32 { DEPENDPATH += . $$INC_DIR INCLUDEPATH += . $$INC_DIR - OPENCV_VERSION = "2413" + OPENCV_VERSION = "320" USE_PRECOMPILED_LIBS = for(lib, LIB_DIR) { #message(Scanning $$lib) @@ -44,7 +44,7 @@ win32 { message(Get pre-compiled opencv $$OPENCV_VERSION libraries here:) message($$lib) LIBS += -L"$$lib/opencv" - LIBS += -lopencv_core$$OPENCV_VERSION -lopencv_highgui$$OPENCV_VERSION -lopencv_imgproc$$OPENCV_VERSION + LIBS += -lopencv_core$$OPENCV_VERSION -lopencv_highgui$$OPENCV_VERSION -lopencv_imgproc$$OPENCV_VERSION -lopencv_videoio$$OPENCV_VERSION -lopencv_imgcodecs$$OPENCV_VERSION -llibwebp USE_PRECOMPILED_LIBS = 1 } }