Hook in the LATE_LIBS to get the Qt lib path

MythTV · Jun 12, 2012 · e38c94c · e38c94c
1 parent 93fc5d5
commit e38c94c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/mythtv/external/nzmqt/src/nzmqt.pro b/mythtv/external/nzmqt/src/nzmqt.pro
@@ -31,6 +31,7 @@ HEADERS += \
     common/Tools.h
 
 LIBS += -lzmq
+LIBS += $${LATE_LIBS}
 
 INCLUDEPATH += \
     ../include \
@@ -43,7 +44,3 @@ inc.files += ../include/nzmqt/nzmqt.hpp
 inc.path  = $${PREFIX}/include/
 
 INSTALLS += inc
-
-mingw {
-    QMAKE_LIBDIR += $$[BUILDLIBDIR]
-}
diff --git a/mythtv/external/qjson/src/src.pro b/mythtv/external/qjson/src/src.pro
@@ -22,6 +22,8 @@ macx: CONFIG += lib_bundle
 QJSON_CPP = $$QJSON_SRCBASE
 INCLUDEPATH += $$QJSON_CPP
 
+LIBS += $${LATE_LIBS}
+
 PRIVATE_HEADERS += \
   json_parser.hh \
   json_scanner.h \
@@ -90,7 +92,3 @@ cppinc.path  += $${PREFIX}/include/QJson/
 
 INSTALLS += cppinc
 
-mingw {
-    QMAKE_LIBDIR += $$[BUILDLIBDIR]
-}
-
diff --git a/mythtv/settings.pro b/mythtv/settings.pro
@@ -53,7 +53,6 @@ isEmpty(TARGET_OS) : win32 {
     # win32-packager.pl builds Qt under DOS, but MythTV is built in MinGW.
     # This corrects the moc tool path from a DOS-style to a unix style:
     QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
-    QMAKE_LIBDIR += $${BUILDLIBDIR}
 }
 
 # if CYGWIN compile, set up flag in CONFIG