forked from qt-creator/qt-creator
Windows/deployqt: Only ship necessary version of EGL/GLES libs
Task-number: QTCREATORBUG-8296 Change-Id: Idf27427715f3234c077466b623d32829577f13c7 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
@@ -89,6 +89,10 @@ def op_failed(details = None):
|
|||||||
|
|
||||||
def is_ignored_windows_file(use_debug, basepath, filename):
|
def is_ignored_windows_file(use_debug, basepath, filename):
|
||||||
ignore_patterns = ['.lib', '.pdb', '.exp', '.ilk']
|
ignore_patterns = ['.lib', '.pdb', '.exp', '.ilk']
|
||||||
|
if use_debug:
|
||||||
|
ignore_patterns.extend(['libEGL.dll', 'libGLESv2.dll'])
|
||||||
|
else:
|
||||||
|
ignore_patterns.extend(['libEGLd.dll', 'libGLESv2d.dll'])
|
||||||
for ip in ignore_patterns:
|
for ip in ignore_patterns:
|
||||||
if filename.endswith(ip):
|
if filename.endswith(ip):
|
||||||
return True
|
return True
|
||||||
@@ -120,7 +124,7 @@ def copy_qt_libs(target_qt_prefix_path, qt_libs_dir, qt_plugin_dir, qt_import_di
|
|||||||
os.makedirs(lib_dest)
|
os.makedirs(lib_dest)
|
||||||
|
|
||||||
if common.is_windows_platform():
|
if common.is_windows_platform():
|
||||||
libraries = [lib for lib in libraries if debug_build == is_debug(lib)]
|
libraries = [lib for lib in libraries if not is_ignored_windows_file(debug_build, '', lib)]
|
||||||
|
|
||||||
for library in libraries:
|
for library in libraries:
|
||||||
print library, '->', lib_dest
|
print library, '->', lib_dest
|
||||||
|
Reference in New Issue
Block a user