Index: wflow-py/make_wflow_exe_cx.py
===================================================================
diff -u -r9268c4673047de7b7b49180f53d01f6d1261e191 -r1221929552575774995e54f8057e28b3b3375cbb
--- wflow-py/make_wflow_exe_cx.py	(.../make_wflow_exe_cx.py)	(revision 9268c4673047de7b7b49180f53d01f6d1261e191)
+++ wflow-py/make_wflow_exe_cx.py	(.../make_wflow_exe_cx.py)	(revision 1221929552575774995e54f8057e28b3b3375cbb)
@@ -5,54 +5,56 @@
 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"]
+if sys.platform == 'win32':
+    # 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 = 'deltashell'
+target ='normal'
 
 data_files=[]
 scipy_path = os.path.dirname(scipy.__file__)
@@ -92,11 +94,12 @@
     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='.'))
+if sys.platform == 'win32':
+    # 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='.'))
 
 # GDAL data files
 gdaldata = os.getenv("GDAL_DATA")
@@ -106,14 +109,15 @@
 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+'-'+target+'-'+nrbits
+thename = "Wflow"+MVERSION+'-'+target+'-'+sys.platform+'-'+nrbits
 
 packages = ["osgeo"]
 
 if target == 'openda':
     includes = ['wflow.wflow_bmi','wflow.wflow_w3ra','wflow.wflow_bmi_combined']
     packages.append('openda_bmi')
 elif target == 'deltashell':
+    import zmq.libzmq
     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']