Index: wflow-py/make_wflow_exe_cx.py
===================================================================
diff -u -ra3a46d240008731e5728ffb8ea9740e3154ea617 -r8ad602d91ce4ab7f56df28e0f8d7b6b6399d6f70
--- wflow-py/make_wflow_exe_cx.py	(.../make_wflow_exe_cx.py)	(revision a3a46d240008731e5728ffb8ea9740e3154ea617)
+++ wflow-py/make_wflow_exe_cx.py	(.../make_wflow_exe_cx.py)	(revision 8ad602d91ce4ab7f56df28e0f8d7b6b6399d6f70)
@@ -5,11 +5,54 @@
 import matplotlib
 import scipy
 import sys
+import zmq.libzmq
 
 
+pdir = os.path.dirname(sys.executable) + "/"
+
+# list comes from: c:\Anaconda\conda-meta\mkl-11.3.3-1.json
+MKL_files= [pdir + "Library/bin/cilkrts20.dll",
+    pdir + "Library/bin/ifdlg100.dll",
+    pdir + "Library/bin/libchkp.dll",
+    pdir + "Library/bin/libicaf.dll",
+    pdir + "Library/bin/libifcoremd.dll",
+    pdir + "Library/bin/libifcoremdd.dll",
+    pdir + "Library/bin/libifcorert.dll",
+    pdir + "Library/bin/libifcorertd.dll",
+    pdir + "Library/bin/libifportmd.dll",
+    pdir + "Library/bin/libimalloc.dll",
+    pdir + "Library/bin/libiomp5md.dll",
+    pdir + "Library/bin/libiompstubs5md.dll",
+    pdir + "Library/bin/libmmd.dll",
+    pdir + "Library/bin/libmmdd.dll",
+    pdir + "Library/bin/libmpx.dll",
+    pdir + "Library/bin/liboffload.dll",
+    pdir + "Library/bin/mkl_avx.dll",
+    pdir + "Library/bin/mkl_avx2.dll",
+    pdir + "Library/bin/mkl_avx512.dll",
+    pdir + "Library/bin/mkl_core.dll",
+    pdir + "Library/bin/mkl_def.dll",
+    pdir + "Library/bin/mkl_intel_thread.dll",
+    pdir + "Library/bin/mkl_mc.dll",
+    pdir + "Library/bin/mkl_mc3.dll",
+    pdir + "Library/bin/mkl_msg.dll",
+    pdir + "Library/bin/mkl_rt.dll",
+    pdir + "Library/bin/mkl_sequential.dll",
+    pdir + "Library/bin/mkl_tbb_thread.dll",
+    pdir + "Library/bin/mkl_vml_avx.dll",
+    pdir + "Library/bin/mkl_vml_avx2.dll",
+    pdir + "Library/bin/mkl_vml_avx512.dll",
+    pdir + "Library/bin/mkl_vml_cmpt.dll",
+    pdir + "Library/bin/mkl_vml_def.dll",
+    pdir + "Library/bin/mkl_vml_mc.dll",
+    pdir + "Library/bin/mkl_vml_mc2.dll",
+    pdir + "Library/bin/mkl_vml_mc3.dll",
+    pdir + "Library/bin/svml_dispmd.dll"]
+
+
 os.system("python mkversion.py")
 
-target = 'openda'
+target = 'deltashell'
 
 data_files=[]
 scipy_path = os.path.dirname(scipy.__file__)
@@ -49,7 +92,8 @@
     ddir = os.path.join('mpl-data',os.path.basename(mpldir[0]))
     data_files.extend(mkdatatuples(mpldir[1],destdir=ddir))
 
-
+# MKL files
+data_files.extend(mkdatatuples(MKL_files,destdir="."))
 # pcraster dll's
 ddir = "c:/pcraster/lib/"
 data_files.extend(mkdatatuples(glob.glob(ddir + "/*.dll"),destdir='.'))
@@ -62,14 +106,21 @@
 nrbits = str(ctypes.sizeof(ctypes.c_voidp) * 8)
 #includes = ['wflow.wflow_bmi','wflow.wflow_w3ra','wflow.wflow_bmi_combined','bmi','bmi.wrapper',"pcraster","osgeo.ogr"]
 
-thename = "Wflow"+MVERSION+'-'+nrbits
+thename = "Wflow"+MVERSION+'-'+target+'-'+nrbits
 
 packages = ["osgeo"]
 
 
 if target == 'openda':
     includes = ['wflow.wflow_bmi','wflow.wflow_w3ra','wflow.wflow_bmi_combined']
     packages.append('openda_bmi')
+elif target == 'deltashell':
+    data_files.extend([zmq.libzmq.__file__, ])
+    includes = ["zmq.backend.cython","zmq.utils.garbage","requests","zmq.eventloop.zmqstream",
+                 'wflow.wflow_bmi','wflow.wflow_w3ra','wflow.wflow_bmi_combined']
+    packages.append('zmq.backend.cython')
+    packages.append('bmi')
+    packages.append('pkg_resources')
 else:
     includes = ['wflow.wflow_bmi', 'wflow.wflow_w3ra', 'wflow.wflow_bmi_combined']
 
@@ -78,6 +129,7 @@
 
 
 
+
 if target == 'openda':
     import thrift
     executables = [
@@ -97,6 +149,24 @@
         Executable('wflow/wflow_floodmap.py', base=base),
         Executable('wflow/wflow_hbv.py', base=base)
     ]
+elif target == 'deltashell':
+    executables = [
+        Executable('Scripts/pcr2netcdf.py', base=base),
+        Executable('Scripts/bmi2runner.py', base=base),
+        Executable('Scripts/wfds_core.py', base=base),
+        Executable('Scripts/wflow_prepare_step2.py', base=base),
+        Executable('Scripts/wflow_prepare_step1.py', base=base),
+        Executable('Scripts/wflow_sbm_rtc.py', base=base),
+        Executable('wflow/wflow_topoflex.py', base=base),
+        Executable('wflow/wflow_sbm.py', base=base),
+        Executable('wflow/wflow_adapt.py', base=base),
+        Executable('wflow/wflow_w3ra.py', base=base),
+        Executable('wflow/wflow_delwaq.py', base=base),
+        Executable('wflow/wflow_wave.py', base=base),
+        Executable('wflow/wflow_gr4.py', base=base),
+        Executable('wflow/wflow_floodmap.py', base=base),
+        Executable('wflow/wflow_hbv.py', base=base)
+    ]
 else:
     executables = [
         Executable('Scripts/pcr2netcdf.py', base=base),