Merge pull request #3185 from SomberNight/win_7_8_binaries_hotfix

hotfix: pre-Windows10 binaries
spesmilo · Nov 3, 2017 · d7f2937 · d7f2937
2 parents e65b995 + ccb28e9
commit d7f2937
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
@@ -61,6 +61,9 @@ for d in a.datas:
         a.datas.remove(d)
         break
 
+# hotfix for #3171 (pre-Win10 binaries)
+a.binaries = [x for x in a.binaries if not x[1].lower().startswith(r'c:\windows')]
+
 pyz = PYZ(a.pure)
 exe = EXE(pyz,
           a.scripts,

diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh
@@ -111,6 +111,4 @@ wine nsis.exe /S
 #cp upx*/upx.exe .
 
 # add dlls needed for pyinstaller:
-cp $WINEPREFIX/drive_c/windows/system32/msvcp90.dll $WINEPREFIX/drive_c/python$PYTHON_VERSION/
-cp $WINEPREFIX/drive_c/windows/system32/msvcm90.dll $WINEPREFIX/drive_c/python$PYTHON_VERSION/
 cp $WINEPREFIX/drive_c/python$PYTHON_VERSION/Lib/site-packages/PyQt5/Qt/bin/* $WINEPREFIX/drive_c/python$PYTHON_VERSION/