use dynamic providers on win

MerginMaps · Nov 22, 2019 · aa81536 · aa81536
1 parent 5639a29
commit aa81536
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/win/distribute.cmd b/win/distribute.cmd
@@ -42,8 +42,9 @@ set LIB=%LIB%;C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\x64\
 set INCLUDE=%STAGE_PATH%\apps\Qt5\include;%STAGE_PATH%\include
 
 rem GEODIFF
-IF NOT EXIST "%STAGE_PATH%\lib\geodiff.dll" call %~dp0\recipes\geodiff\recipe.bat
-IF NOT EXIST "%STAGE_PATH%\lib\geodiff.dll" goto error
+IF NOT EXIST "%STAGE_PATH%\lib\geodiff.lib" call %~dp0\recipes\geodiff\recipe.bat
+IF NOT EXIST "%STAGE_PATH%\bin\geodiff.dll" goto error
+IF NOT EXIST "%STAGE_PATH%\lib\geodiff.lib" goto error
 
 rem QGIS
 call %~dp0\recipes\qgis\recipe.bat

diff --git a/win/recipes/qgis/recipe.bat b/win/recipes/qgis/recipe.bat
@@ -1,6 +1,6 @@
 @echo on
 
-set VERSION_qgis=f8a143bce818f9dd4fe601facdf97deb7707e182
+set VERSION_qgis=5706a9f739b1d8588469a7d905f5b19e352867b8
 set URL_qgis=https://github.com/qgis/QGIS/archive/%VERSION_qgis%.tar.gz
 set BUILD_qgis=%BUILD_PATH%\qgis
 set REPO_qgis=%REPO_PATH%\qgis
@@ -37,7 +37,6 @@ cmake -G %CMAKE_GENERATOR% ^
 -DUSE_OPENCL=OFF ^
 -DWITH_GRASS7:BOOL=OFF ^
 -DPYTHON_EXECUTABLE:PATH=%PY36%/python.exe ^
--DFORCE_STATIC_PROVIDERS=TRUE ^
 -DFLEX_EXECUTABLE:PATH="C:/ProgramData/chocolatey/lib/winflexbison3/tools/win_flex.exe" ^
 -DBISON_EXECUTABLE:PATH="C:/ProgramData/chocolatey/lib/winflexbison3/tools/win_bison.exe" ^
 %REPO_qgis%