Changeset 13200
- Timestamp:
- Feb 4, 2012, 1:55:58 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure.ac
r13199 r13200 223 223 LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" 224 224 LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a" 225 LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a" 225 226 if test "x$libutp_extra_libs" != "x" ; then 226 227 LIBUTP_LIBS="$LIBUTP_LIBS $libutp_extra_libs" 228 LIBUTP_LIBS_QT="$LIBUTP_LIBS_QT $libutp_extra_libs" 227 229 fi 228 230 AC_DEFINE([WITH_UTP],[1]) … … 234 236 AC_SUBST(LIBUTP_CFLAGS) 235 237 AC_SUBST(LIBUTP_LIBS) 238 AC_SUBST(LIBUTP_LIBS_QT) 236 239 AM_CONDITIONAL([BUILD_UTP],[test "x$build_utp" = "xyes"]) 237 240 AC_MSG_RESULT([$build_utp]) … … 531 534 gtk/Makefile 532 535 gtk/icons/Makefile 536 qt/config.pri 533 537 web/Makefile 534 538 web/images/Makefile -
trunk/qt/qtr.pro
r12957 r13200 17 17 18 18 TRANSMISSION_TOP = .. 19 20 include(config.pri) 21 19 22 INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH} 20 23 INCLUDEPATH += $${TRANSMISSION_TOP} 21 24 LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a 22 exists( $${TRANSMISSION_TOP}/third-party/libutp/Makefile ) { 23 LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a 24 } 25 LIBS += $${LIBUTP_LIBS} 25 26 LIBS += $${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 27 LIBS += $${LIBUPNP_LIBS} 28 LIBS += $${LIBNATPMP_LIBS} 30 29 unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt 31 30 win32:DEFINES += QT_DBUS
Note: See TracChangeset
for help on using the changeset viewer.