Changeset 13200


Ignore:
Timestamp:
Feb 4, 2012, 1:55:58 AM (7 years ago)
Author:
jordan
Message:

(trunk qt) #4490 "transmission-qt FTB, undefined references to UTP library" -- fixed with patch by niol

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r13199 r13200  
    223223        LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
    224224        LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
     225        LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a"
    225226        if test "x$libutp_extra_libs" != "x" ; then
    226227            LIBUTP_LIBS="$LIBUTP_LIBS $libutp_extra_libs"
     228            LIBUTP_LIBS_QT="$LIBUTP_LIBS_QT $libutp_extra_libs"
    227229        fi
    228230        AC_DEFINE([WITH_UTP],[1])
     
    234236AC_SUBST(LIBUTP_CFLAGS)
    235237AC_SUBST(LIBUTP_LIBS)
     238AC_SUBST(LIBUTP_LIBS_QT)
    236239AM_CONDITIONAL([BUILD_UTP],[test "x$build_utp" = "xyes"])
    237240AC_MSG_RESULT([$build_utp])
     
    531534                 gtk/Makefile
    532535                 gtk/icons/Makefile
     536                 qt/config.pri
    533537                 web/Makefile
    534538                 web/images/Makefile
  • trunk/qt/qtr.pro

    r12957 r13200  
    1717
    1818TRANSMISSION_TOP = ..
     19
     20include(config.pri)
     21
    1922INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
    2023INCLUDEPATH += $${TRANSMISSION_TOP}
    2124LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
    22 exists( $${TRANSMISSION_TOP}/third-party/libutp/Makefile ) {
    23     LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a
    24 }
     25LIBS += $${LIBUTP_LIBS}
    2526LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
    26 exists( $${TRANSMISSION_TOP}/third-party/miniupnp/Makefile ) {
    27     LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
    28 }
    29 LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
     27LIBS += $${LIBUPNP_LIBS}
     28LIBS += $${LIBNATPMP_LIBS}
    3029unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
    3130win32:DEFINES += QT_DBUS
Note: See TracChangeset for help on using the changeset viewer.