Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Library names for Qt4 was incorrect.

This commit is contained in:
Philippe Payant 2017-06-21 13:34:59 -04:00 committed by Jussi Pakkanen
parent ad1b487285
commit 85eddf4eb2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mesonbuild/dependencies/ui.py
View File

@ -291,10 +291,14 @@ class QtBaseDependency(ExternalDependency):
mincdir = os.path.join(incdir, 'Qt' + module) mincdir = os.path.join(incdir, 'Qt' + module)
self.compile_args.append('-I' + mincdir) self.compile_args.append('-I' + mincdir)
if for_windows(self.env.is_cross_build(), self.env): if for_windows(self.env.is_cross_build(), self.env):
libfile = os.path.join(libdir, self.qtpkgname + module + '.lib') if self.qtver == '4':
base_name = 'Qt' + module + '4'
else:
base_name = 'Qt5' + module
libfile = os.path.join(libdir, base_name + '.lib')
if not os.path.isfile(libfile): if not os.path.isfile(libfile):
# MinGW can link directly to .dll # MinGW can link directly to .dll
libfile = os.path.join(self.bindir, self.qtpkgname + module + '.dll') libfile = os.path.join(self.bindir, base_name + '.dll')
if not os.path.isfile(libfile): if not os.path.isfile(libfile):
self.is_found = False self.is_found = False
break break