Ticket #5177: mythtv_qt4libdir.2.patch

File mythtv_qt4libdir.2.patch, 9.0 KB (added by Mark Spieth, 16 years ago)

  • libs/libmythtv/libmythtv.pro

     
    2727DEPENDPATH  += ../libmythlivemedia/UsageEnvironment/include
    2828DEPENDPATH  += ../libmythlivemedia/UsageEnvironment
    2929
    30 LIBS += -L../libmyth -L../libavutil -L../libavcodec -L../libavformat
    31 LIBS += -L../libmythui -L../libmythupnp
    32 LIBS += -L../libmythmpeg2 -L../libmythdvdnav
    33 LIBS += -L../libmythfreemheg -L../libmythlivemedia
     30QMAKE_LIBDIR_FLAGS += -L../libmyth -L../libavutil -L../libavcodec -L../libavformat
     31QMAKE_LIBDIR_FLAGS += -L../libmythui -L../libmythupnp
     32QMAKE_LIBDIR_FLAGS += -L../libmythmpeg2 -L../libmythdvdnav
     33QMAKE_LIBDIR_FLAGS += -L../libmythfreemheg -L../libmythlivemedia
    3434LIBS += -lmyth-$$LIBVERSION         -lmythavutil-$$LIBVERSION
    3535LIBS += -lmythavcodec-$$LIBVERSION  -lmythavformat-$$LIBVERSION
    3636LIBS += -lmythui-$$LIBVERSION       -lmythupnp-$$LIBVERSION

  • libs/libs-dephack.pro

     
    77mingw {
    88    # Worked around by building libmyth first,
    99    # with dlltool faking the symbols from the other two libs
    10     LIBS += -L../libmyth -lmyth-$$LIBVERSION
     10    QMAKE_LIBDIR_FLAGS += -L../libmyth
     11    LIBS += -lmyth-$$LIBVERSION
    1112
    1213    # For easier debugging, put lib in same place as mythfrontend.exe
    1314    target.path = $${PREFIX}/bin

  • libs/libavcodec/libavcodec.pro

     
    4848INSTALLS += inc
    4949
    5050LIBS += $$LOCAL_LIBDIR_X11
    51 LIBS += -L../libavutil -lmythavutil-$$LIBVERSION $$EXTRALIBS
     51QMAKE_LIBDIR_FLAGS += -L../libavutil
     52LIBS += -lmythavutil-$$LIBVERSION $$EXTRALIBS
    5253LIBS += -lz
    5354
    5455contains( CONFIG_AASC_DECODER, yes )            { SOURCES *= aasc.c }

  • libs/libmythui/libmythui.pro

     
    1414DEPENDPATH += ../libmyth .
    1515
    1616# There is a circular dependency here, and this lib may not be built yet:
    17 #LIBS += -L../libmyth -lmyth-$$LIBVERSION
     17#QMAKE_LIBDIR_FLAGS += -L../libmyth
     18#LIBS += -lmyth-$$LIBVERSION
    1819
    1920QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
    2021
    … …  
    4243inc.files += mythuitext.h mythuibutton.h mythlistbutton.h xmlparsebase.h
    4344inc.files += myththemedmenu.h mythdialogbox.h mythfontproperties.h
    4445inc.files += mythuiclock.h mythgesture.h mythuitextedit.h mythprogressdialog.h
     46inc.files += mythprogressdialog.h
    4547
    4648INSTALLS += inc
    4749

  • libs/libavformat/libavformat.pro

     
    188188
    189189INSTALLS += inc
    190190
    191 LIBS += -L../libavcodec -lmythavcodec-$$LIBVERSION -L../libavutil -lmythavutil-$$LIBVERSION
     191QMAKE_LIBDIR_FLAGS += -L../libavcodec
     192LIBS += -lmythavcodec-$$LIBVERSION -L../libavutil -lmythavutil-$$LIBVERSION
    192193LIBS += -lz
    193194using_xvmc:LIBS += $$CONFIG_XVMC_LIBS
    194195

  • libs/libmyth/libmyth.pro

     
    5353DEPENDPATH += ../libmythupnp
    5454
    5555
    56 LIBS += -L../libmythsamplerate   -lmythsamplerate-$${LIBVERSION}
    57 LIBS += -L../libmythsoundtouch   -lmythsoundtouch-$${LIBVERSION}
    58 LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
    59 LIBS += -L../libmythupnp         -lmythupnp-$${LIBVERSION}
    60 LIBS += -L../libmythfreesurround -lmythfreesurround-$${LIBVERSION}
    61 LIBS += -L../libavcodec          -lmythavcodec-$${LIBVERSION}
    62 LIBS += -L../libavutil           -lmythavutil-$${LIBVERSION}
     56QMAKE_LIBDIR_FLAGS += -L../libmythsamplerate
     57QMAKE_LIBDIR_FLAGS += -L../libmythsoundtouch
     58QMAKE_LIBDIR_FLAGS += -L../libmythui
     59QMAKE_LIBDIR_FLAGS += -L../libmythupnp
     60QMAKE_LIBDIR_FLAGS += -L../libmythfreesurround
     61QMAKE_LIBDIR_FLAGS += -L../libavcodec
     62QMAKE_LIBDIR_FLAGS += -L../libavutil
     63LIBS += -lmythsamplerate-$${LIBVERSION}
     64LIBS += -lmythsoundtouch-$${LIBVERSION}
     65LIBS += -lmythui-$${LIBVERSION}
     66LIBS += -lmythupnp-$${LIBVERSION}
     67LIBS += -lmythfreesurround-$${LIBVERSION}
     68LIBS += -lmythavcodec-$${LIBVERSION}
     69LIBS += -lmythavutil-$${LIBVERSION}
    6370
    6471TARGETDEPS += ../libmythsamplerate/libmythsamplerate-$${MYTH_LIB_EXT}
    6572TARGETDEPS += ../libmythsoundtouch/libmythsoundtouch-$${MYTH_LIB_EXT}
    … …  
    112119    target.path = $${PREFIX}/bin
    113120
    114121    LIBS -= -lmythui-$$LIBVERSION  -lmythupnp-$$LIBVERSION
    115     LIBS += -L. -lmythui-bootstrap -lmythupnp-bootstrap
     122    QMAKE_LIBDIR_FLAGS += -L.
     123    LIBS += -lmythui-bootstrap -lmythupnp-bootstrap
    116124    POST_TARGETDEPS += libmythui-bootstrap.a libmythupnp-bootstrap.a
    117125    implib.target    = libmythui-bootstrap.a
    118126    implib.depends   = ../libmythui/libmythui.def

  • libs/libmythupnp/libmythupnp.pro

     
    3636DEPENDPATH += ../libmyth
    3737
    3838# There is a circular dependency here, and this lib may not be built yet:
    39 #LIBS += -L../libmyth
     39#QMAKE_LIBDIR_FLAGS += -L../libmyth
    4040#LIBS += -lmyth-$$LIBVERSION
    4141#TARGETDEPS += ../libmyth/libmyth-$${MYTH_SHLIB_EXT}
    4242

  • libs/libmythfreesurround/libmythfreesurround.pro

     
    2525    DEFINES += USE_FFTW3
    2626} else {
    2727    DEPENDPATH += ../libavcodec
    28     LIBS += -L../libavcodec -lavcodec
     28    QMAKE_LIBDIR_FLAGS += -L../libavcodec
     29    LIBS += -lavcodec
    2930    INCLUDEPATH += ../libavutil
    3031}
    3132

  • programs/programs-libs.pro

     
    33INCLUDEPATH += ../../libs/libmythupnp ../../libs/libmythui
    44INCLUDEPATH += ../../libs/libmythlivemedia
    55
    6 LIBS += -L../../libs/libmyth -L../../libs/libmythtv
    7 LIBS += -L../../libs/libavutil -L../../libs/libavcodec -L../../libs/libavformat
    8 LIBS += -L../../libs/libmythfreemheg
    9 LIBS += -L../../libs/libmythui
    10 LIBS += -L../../libs/libmythupnp
    11 LIBS += -L../../libs/libmythlivemedia
     6QMAKE_LIBDIR_FLAGS += -L../../libs/libmyth -L../../libs/libmythtv
     7QMAKE_LIBDIR_FLAGS += -L../../libs/libavutil -L../../libs/libavcodec -L../../libs/libavformat
     8QMAKE_LIBDIR_FLAGS += -L../../libs/libmythfreemheg
     9QMAKE_LIBDIR_FLAGS += -L../../libs/libmythui
     10QMAKE_LIBDIR_FLAGS += -L../../libs/libmythupnp
     11QMAKE_LIBDIR_FLAGS += -L../../libs/libmythlivemedia
    1212
    1313LIBS += -lmythtv-$$LIBVERSION -lmythavformat-$$LIBVERSION
    1414LIBS += -lmythavutil-$$LIBVERSION -lmythavcodec-$$LIBVERSION

  • programs/mythtranscode/replex/replex.pro

     
    1919INCLUDEPATH += ../../../libs/libavcodec ../../../libs/libavformat
    2020INCLUDEPATH += ../../../libs/libavutil  ../../../libs/libmythmpeg2
    2121
    22 LIBS += -L../../../libs/libavutil -L../../../libs/libavcodec -L../../../libs/libavformat
     22QMAKE_LIBDIR_FLAGS += -L../../../libs/libavutil -L../../../libs/libavcodec -L../../../libs/libavformat
    2323LIBS += -lmythavcodec-$$LIBVERSION -lmythavformat-$$LIBVERSION -lmythavutil-$$LIBVERSION
    2424LIBS += $$EXTRA_LIBS
    2525

  • filters/postprocess/postprocess.pro

     
    77SOURCES += filter_postprocess.c
    88
    99# For pp_free_context, pp_free_mode, pp_get_context, pp_help:
    10 LIBS += -L../../libs/libpostproc -lpostproc-$${LIBVERSION}
     10QMAKE_LIBDIR_FLAGS += -L../../libs/libpostproc
     11LIBS += -lpostproc-$${LIBVERSION}

  • filters/filter-avcodec.pro

     
    66INCLUDEPATH += ../../libs/libavcodec ../../libs/libavutil
    77DEPENDPATH  += ../../libs/libavcodec ../../libs/libavutil
    88
    9 LIBS += -L../../libs/libavutil -lmythavutil-$${LIBVERSION}
    10 LIBS += -L../../libs/libavcodec -lmythavcodec-$${LIBVERSION}
     9QMAKE_LIBDIR_FLAGS += -L../../libs/libavutil
     10QMAKE_LIBDIR_FLAGS += -L../../libs/libavcodec
     11LIBS += -lmythavutil-$${LIBVERSION}
     12LIBS += -lmythavcodec-$${LIBVERSION}
    1113
    1214# Rebuild (link) this filter if the lib changes
    1315TARGETDEPS += ../../libs/libavutil/libmythavutil-$${MYTH_SHLIB_EXT}