diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-04 04:54:55 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-04 04:54:55 +0300 |
| commit | 412f9f50837c95f5b304661868becb08a546d54d (patch) | |
| tree | 1ce797a170bba1ce73d8c4c64cac154ebd669e45 | |
| parent | 698b1c6471bb13f5a0c46dbca559b49361a6cc8f (diff) | |
| download | meson-412f9f50837c95f5b304661868becb08a546d54d.zip meson-412f9f50837c95f5b304661868becb08a546d54d.tar.gz meson-412f9f50837c95f5b304661868becb08a546d54d.tar.bz2 | |
Work with MinGW too.
| -rw-r--r-- | dependencies.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dependencies.py b/dependencies.py index d4db051..8599c66 100644 --- a/dependencies.py +++ b/dependencies.py @@ -598,11 +598,15 @@ class Qt5Dependency(Dependency): incdir = qvars['QT_INSTALL_HEADERS'] self.cargs.append('-I' + incdir) libdir = qvars['QT_INSTALL_LIBS'] + bindir = qvars['QT_INSTALL_BINS'] #self.largs.append('-L' + libdir) for module in mods: mincdir = os.path.join(incdir, 'Qt' + module) - libfile = os.path.join(libdir, 'Qt5' + module + '.lib') self.cargs.append('-I' + mincdir) + libfile = os.path.join(libdir, 'Qt5' + module + '.lib') + if not os.path.isfile(libfile): + # MinGW links directly to .dll, not to .lib. + libfile = os.path.join(bindir, 'Qt5' + module + '.dll') self.largs.append(libfile) self.is_found = True |