diff --git a/README.md b/README.md
index 16106c3..0c5039c 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ At this moment the development environment is based on Visual Studio 2017.
## Environment variables
Environment variables (example)
-QT5DIR64=c:\Qt\Qt5.12.6\5.12.6\msvc2017_64\
-QT5DIR64OSGEO=c:\OSGeo4W64\apps\Qt5
+QT5DIR_OSGEO=c:\OSGeo4W64\apps\Qt5
+BOOST_ROOT_DIR=c:\boost\boost_1_85_0\
## Link Libraries
netCDF library:
diff --git a/dispatch_release_dll_to_qgis.bat b/dispatch_release_dll_to_qgis.bat
index fef3228..e15e890 100644
--- a/dispatch_release_dll_to_qgis.bat
+++ b/dispatch_release_dll_to_qgis.bat
@@ -6,8 +6,8 @@ copy .\doc\qgis_umesh_installation.pdf "c:\Program Files\Deltares\qgis_umesh\do
copy .\icons\*.* "c:\Program Files\Deltares\qgis_umesh\icons\*.*"
rem copy to Bulletin
-copy "c:\OSGeo4W\apps\qgis\plugins\qgis_umesh.dll" n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.34.00_qgis_umesh\*.*
-copy .\doc\qgis_umesh_um.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.34.00_qgis_umesh\doc\*.*
-copy .\doc\qgis_umesh_installation.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.34.00_qgis_umesh\doc\*.*
-copy .\icons\*.* n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.34.00_qgis_umesh\icons\*.*
+copy "c:\OSGeo4W\apps\qgis\plugins\qgis_umesh.dll" n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.40.01_qgis_umesh\*.*
+copy .\doc\qgis_umesh_um.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.40.01_qgis_umesh\doc\*.*
+copy .\doc\qgis_umesh_installation.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.40.01_qgis_umesh\doc\*.*
+copy .\icons\*.* n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.40.01_qgis_umesh\icons\*.*
rem pause
diff --git a/lib/x64/debug/qgis_analysis.lib b/lib/x64/debug/qgis_analysis.lib
index f8dfb9f..3af163c 100644
Binary files a/lib/x64/debug/qgis_analysis.lib and b/lib/x64/debug/qgis_analysis.lib differ
diff --git a/lib/x64/debug/qgis_core.lib b/lib/x64/debug/qgis_core.lib
index 56c4724..c0c5ad3 100644
Binary files a/lib/x64/debug/qgis_core.lib and b/lib/x64/debug/qgis_core.lib differ
diff --git a/lib/x64/debug/qgis_gui.lib b/lib/x64/debug/qgis_gui.lib
index 9ed329d..a0ade69 100644
Binary files a/lib/x64/debug/qgis_gui.lib and b/lib/x64/debug/qgis_gui.lib differ
diff --git a/lib/x64/release/qgis_analysis.lib b/lib/x64/release/qgis_analysis.lib
index f8dfb9f..3af163c 100644
Binary files a/lib/x64/release/qgis_analysis.lib and b/lib/x64/release/qgis_analysis.lib differ
diff --git a/lib/x64/release/qgis_core.lib b/lib/x64/release/qgis_core.lib
index 56c4724..c0c5ad3 100644
Binary files a/lib/x64/release/qgis_core.lib and b/lib/x64/release/qgis_core.lib differ
diff --git a/lib/x64/release/qgis_gui.lib b/lib/x64/release/qgis_gui.lib
index 9ed329d..a0ade69 100644
Binary files a/lib/x64/release/qgis_gui.lib and b/lib/x64/release/qgis_gui.lib differ
diff --git a/packages/qgis_umesh.vcxproj b/packages/qgis_umesh.vcxproj
index be4b8d1..a246525 100644
--- a/packages/qgis_umesh.vcxproj
+++ b/packages/qgis_umesh.vcxproj
@@ -37,11 +37,11 @@
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
Performing Custom Build Step: MOC%27ing %(FullPath)
Performing Custom Build Step: MOC%27ing %(FullPath)
generated\moc_%(Filename).cpp;%(Outputs)
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
generated\moc_%(Filename).cpp;%(Outputs)
@@ -51,12 +51,12 @@
generated\moc_%(Filename).cpp;%(Outputs)
Performing Custom Build Step: MOC%27ing %(FullPath)
Performing Custom Build Step: MOC%27ing %(FullPath)
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
Performing Custom Build Step: MOC%27ing %(FullPath)
Performing Custom Build Step: MOC%27ing %(FullPath)
generated\moc_%(Filename).cpp;%(Outputs)
@@ -65,8 +65,8 @@
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
Performing Custom Build Step: MOC%27ing %(FullPath)
Performing Custom Build Step: MOC%27ing %(FullPath)
generated\moc_%(Filename).cpp;%(Outputs)
@@ -77,28 +77,28 @@
generated\moc_%(Filename).cpp;%(Outputs)
Performing Custom Build Step: MOC%27ing %(FullPath)
Performing Custom Build Step: MOC%27ing %(FullPath)
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
generated\moc_%(Filename).cpp;%(Outputs)
generated\moc_%(Filename).cpp;%(Outputs)
Performing Custom Build Step: MOC%27ing %(FullPath)
Performing Custom Build Step: MOC%27ing %(FullPath)
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
generated\moc_%(Filename).cpp;%(Outputs)
generated\moc_%(Filename).cpp;%(Outputs)
Performing Custom Build Step: MOC%27ing %(FullPath)
Performing Custom Build Step: MOC%27ing %(FullPath)
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
Performing Custom Build Step: MOC%27ing %(FullPath)
Performing Custom Build Step: MOC%27ing %(FullPath)
generated\moc_%(Filename).cpp;%(Outputs)
@@ -113,8 +113,8 @@
generated\moc_%(Filename).cpp;%(Outputs)
Performing Custom Build Step: MOC%27ing %(FullPath)
Performing Custom Build Step: MOC%27ing %(FullPath)
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
- $(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
+ $(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp
@@ -134,13 +134,13 @@
DynamicLibrary
false
MultiByte
- v142
+ v143
DynamicLibrary
false
MultiByte
- v142
+ v143
@@ -182,7 +182,7 @@ call ..\scripts\git_insert_hash.cmd .\include qqis_umesh_version.rc
MaxSpeed
Default
- .\include;c:\OSGeo4W\include\;c:\OSGeo4W\apps\qgis\include;$(QT5DIR64OSGEO)\include;$(QT5DIR64OSGEO)\include\ActiveQt\;$(QT5DIR64OSGEO)\include\Qt\;$(QT5DIR64OSGEO)\include\QtCore\;$(QT5DIR64OSGEO)\include\QtGui\;$(QT5DIR64OSGEO)\include\QtSvg\;$(QT5DIR64OSGEO)\include\QtWidgets\;$(QT5DIR64OSGEO)\include\QtXml\;%(AdditionalIncludeDirectories)
+ .\include;c:\OSGeo4W\include\;c:\OSGeo4W\apps\qgis\include;$(QT5DIR_OSGEO)\include;$(QT5DIR_OSGEO)\include\ActiveQt\;$(QT5DIR_OSGEO)\include\Qt\;$(QT5DIR_OSGEO)\include\QtCore\;$(QT5DIR_OSGEO)\include\QtGui\;$(QT5DIR_OSGEO)\include\QtSvg\;$(QT5DIR_OSGEO)\include\QtWidgets\;$(QT5DIR_OSGEO)\include\QtXml\;$(BOOST_ROOT_DIR);%(AdditionalIncludeDirectories)
WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;QT_DLL;QT_THREAD_SUPPORT;CORE_EXPORT=;%(PreprocessorDefinitions)
true
true
@@ -230,7 +230,7 @@ call ..\scripts\git_insert_hash.cmd .\include qqis_umesh_version.rc
Disabled
- .\include;c:\OSGeo4W\include\google;c:\OSGeo4W\apps\qgis\include;$(QT5DIR64OSGEO)\include;$(QT5DIR64OSGEO)\include\ActiveQt\;$(QT5DIR64OSGEO)\include\Qt\;$(QT5DIR64OSGEO)\include\QtCore\;$(QT5DIR64OSGEO)\include\QtGui\;$(QT5DIR64OSGEO)\include\QtSvg\;$(QT5DIR64OSGEO)\include\QtWidgets\;$(QT5DIR64OSGEO)\include\QtXml\;%(AdditionalIncludeDirectories)
+ .\include;c:\OSGeo4W\include\;c:\OSGeo4W\apps\qgis\include;$(QT5DIR_OSGEO)\include;$(QT5DIR_OSGEO)\include\ActiveQt\;$(QT5DIR_OSGEO)\include\Qt\;$(QT5DIR_OSGEO)\include\QtCore\;$(QT5DIR_OSGEO)\include\QtGui\;$(QT5DIR_OSGEO)\include\QtSvg\;$(QT5DIR_OSGEO)\include\QtWidgets\;$(QT5DIR_OSGEO)\include\QtXml\;$(BOOST_ROOT_DIR);%(AdditionalIncludeDirectories)
WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;CORE_EXPORT=;%(PreprocessorDefinitions)
MultiThreadedDLL
.\Debug/