diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e7cdb6baf81f7e21d02f107a8494d6126f4fc43..6a6b2171b5438904a30c1eef19d8f0efa33adb8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,28 @@
 # Windows 10 with Boost and Exprtk 
 # downloaded and compiled locally as
-# submodules
-win_visual_studio:
+# submodules and linked statically
+win_visual_studio_static_deps:
+    tags:
+        - Win
+
+    before_script:
+        - call VsDevCmd.bat
+        - cd build_scripts\windows
+        - call win_download_dependencies.bat
+        - cd ..\..
+        - cd build_scripts\windows
+        - set DEPENDENCIES_LINK_TYPE=static
+        - call win_VS_build_x64_debug.bat
+
+    script:
+        - call win_run_tests.bat
+
+# Windows 10 with Boost and Exprtk 
+# downloaded and compiled locally as
+# submodules and link dynamically
+#
+# CURRENTLY NOT SUPPORTED!
+win_visual_studio_shared_deps:
     tags:
         - Win
 
@@ -17,6 +38,7 @@ win_visual_studio:
     script:
         - call win_run_tests.bat
 
+
 # Latest Ubuntu with Boost and Exprtk 
 # in system directories
 ubuntu_boost_system:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d7004c8ca312f605ccc78199574b5f4b72c1f29..b63134e2134c603eb8fcf267d502ac6dc72ce8ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -61,7 +61,7 @@ if ("${BUILD_LIB}" STREQUAL "yes")
     if(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
 		add_library(libboost_unit_test STATIC boost_test_lib_dummy.cpp)
 		add_library(libexprtk STATIC exprtk.cpp)
-    elseif(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
+    elseif(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
         message(FATAL_ERROR "Only static linking of external dependencies is supported for Windows systems now!")
     elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
 		add_library(boost_unit_test STATIC boost_test_lib_dummy.cpp)