Skip to content

Commit

Permalink
build: clear QMAKE_LIBDIR_QT to avoid linking against installed libra…
Browse files Browse the repository at this point in the history
…ries

qmake adds QMAKE_LIBDIR_QT before LIBS in the ld command. If mythtv libraries
are installed in the same directory as the Qt libraries it will link against
them. This adds QMAKE_LIBDIR_QT to LATE_LIBS and fixes linking after it.

git-svn-id: http://svn.mythtv.org/svn/trunk@24835 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information
jannau committed May 24, 2010
1 parent 14f6405 commit edae94e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 3 deletions.
3 changes: 0 additions & 3 deletions mythtv/filters/filter-avcodec.pro
@@ -1,8 +1,5 @@
# A few filters use routines from libavcodec. Include this in their .pro file

# This eliminates a linker warning
CONFIG += qt

INCLUDEPATH += ../../libs/libavcodec ../../libs/libavutil ../../libs ../..
DEPENDPATH += ../../libs/libavcodec ../../libs/libavutil

Expand Down
1 change: 1 addition & 0 deletions mythtv/libs/libmythfreemheg/libmythfreemheg.pro
Expand Up @@ -22,5 +22,6 @@ HEADERS += Programs.h Root.h Stream.h Text.h Variables.h Visible.h BaseActions.h
HEADERS += DynamicLineArt.h TokenGroup.h Link.h Logging.h freemheg.h

LIBS += $$EXTRA_LIBS
LIBS += $$LATE_LIBS

include ( ../libs-targetfix.pro )
1 change: 1 addition & 0 deletions mythtv/libs/libmythhdhomerun/libmythhdhomerun.pro
Expand Up @@ -5,6 +5,7 @@ INCLUDEPATH += ../libmythtv
TEMPLATE = lib
TARGET = mythhdhomerun-$$LIBVERSION
CONFIG += thread dll
CONFIG -= qt
target.path = $${LIBDIR}
INSTALLS = target

Expand Down
1 change: 1 addition & 0 deletions mythtv/programs/mythtvosd/mythtvosd.pro
@@ -1,4 +1,5 @@
include ( ../../settings.pro )
include ( ../programs-libs.pro )

QT += network

Expand Down
3 changes: 3 additions & 0 deletions mythtv/settings.pro
Expand Up @@ -138,3 +138,6 @@ EXTRA_LIBS += $$FRIBIDI_LIBS
using_pulse:EXTRA_LIBS += $$PULSE_LIBS

LIRC_LIBS = $$CONFIG_LIRC_LIBS

LATE_LIBS += "-L$$QMAKE_LIBDIR_QT"
QMAKE_LIBDIR_QT = ""

0 comments on commit edae94e

Please sign in to comment.