summaryrefslogtreecommitdiffstats
path: root/utils/common
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2019-11-17 11:25:37 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-06-13 20:11:43 +0200
commitaefbc13e19af974156e76f0b8184dad41982ebfb (patch)
tree3ac6ccc9c9df49e537a173db84bd8cb1dd2565dd /utils/common
parent504f488cce1e83c9e9f04176eab53f9471a8a063 (diff)
downloadrockbox-aefbc13e19af974156e76f0b8184dad41982ebfb.tar.gz
rockbox-aefbc13e19af974156e76f0b8184dad41982ebfb.tar.bz2
rockbox-aefbc13e19af974156e76f0b8184dad41982ebfb.zip
deploy: Add missing Windows system libraries to known list.
Building with mxe failed due to the toolchain (and Qt5) introducing dependencies to system libraries we don't know about. Commit 3083abeb95 thus ignored the actual problem. Revert that and instead add the missing system libraries to the list of known libraries. Change-Id: I29ac296765e580b751d3d906d58ab563d05efde2
Diffstat (limited to 'utils/common')
-rwxr-xr-xutils/common/deploy.py21
1 files changed, 18 insertions, 3 deletions
diff --git a/utils/common/deploy.py b/utils/common/deploy.py
index 3f3b160752..571424756b 100755
--- a/utils/common/deploy.py
+++ b/utils/common/deploy.py
@@ -57,11 +57,21 @@ except ImportError:
# == Global stuff ==
# DLL files to ignore when searching for required DLL files.
-systemdlls = ['advapi32.dll',
+systemdlls = [
+ 'advapi32.dll',
'comdlg32.dll',
+ 'crypt32.dll',
+ 'd3d9.dll',
+ 'dwmapi.dll',
+ 'dxva2.dll',
+ 'evr.dll',
'gdi32.dll',
'imm32.dll',
+ 'imm32.dll',
+ 'iphlpapi.dll',
'kernel32.dll',
+ 'mf.dll',
+ 'mfplat.dll',
'msvcrt.dll',
'msvcrt.dll',
'netapi32.dll',
@@ -70,9 +80,14 @@ systemdlls = ['advapi32.dll',
'setupapi.dll',
'shell32.dll',
'user32.dll',
+ 'userenv.dll',
+ 'uxtheme.dll',
+ 'version.dll',
'winmm.dll',
'winspool.drv',
- 'ws2_32.dll']
+ 'ws2_32.dll',
+ 'wtsapi32.dll'
+ ]
gitrepo = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
@@ -347,7 +362,7 @@ def zipball(programfiles, versionstring, buildfolder, platform=sys.platform):
for f in programfiles:
if re.match(r'^(/|[a-zA-Z]:)', f) != None:
shutil.copy(f, outfolder)
- elif len(f) > 0:
+ else:
shutil.copy(buildfolder + "/" + f, outfolder)
# create zipball from output folder
zf = zipfile.ZipFile(archivename, mode='w', compression=zipfile.ZIP_DEFLATED)