Tweaks to Windows build

NaturalHistoryMuseum · Apr 28, 2016 · 12ccb3d · 12ccb3d
1 parent 1cada97
commit 12ccb3d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -47,18 +47,19 @@
             }
             for script in SCRIPTS
         ],
+        # Strings in braces within 'include_files' tuples expanded in cx_setup
         'include_files': [
             ('{site_packages}/numpy', 'numpy'),
             ('{site_packages}/scipy', 'scipy'),
             ('{site_packages}/sklearn', 'sklearn'),
             ('{environment_root}/Library/bin/mkl_core.dll', 'mkl_core.dll'),
-            ('{environment_root}/Library/bin/msvcr90.dll', 'msvcr90.dll'),
             ('{environment_root}/Library/bin/libiomp5md.dll', 'libiomp5md.dll'),
         ],
         'extra_packages': ['win32com.gen_py'],
         'excludes': [
-            'Tkinter', 'ttk', 'Tkconstants', 'tcl',
-            'future.moves'    # Errors from urllib otherwise
+            'Tkinter', 'ttk', 'Tkconstants', 'tcl', '_ssl',
+            'future.moves',    # Errors from urllib otherwise
+            'PySide.QtNetwork',
         ]
     }
 }
@@ -106,6 +107,8 @@ def cx_setup():
                 'packages': setup_data['packages'] + setup_data['win32']['extra_packages'],
                 'excludes': setup_data['win32']['excludes'],
                 'include_files': include_files,
+                'include_msvcr': True,
+                'optimize': 2,
             },
             'bdist_msi': {
                 'upgrade_code': '{fe2ed61d-cd5e-45bb-9d16-146f725e522f}'