github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-14 02:27:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4824 from starius/mxe-compat

Browse source 
compatibility with MXE
This commit is contained in:
sledgehammer999 2016-03-04 17:25:57 -06:00
commit 8b559a8b51
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -8345,7 +8345,7 @@ fi
$as_echo "$as_me: Running qmake to generate the makefile..." >&6;}
CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
$QT_QMAKE -r $CONFDIR/qbittorrent.pro
$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"
ret="$?"

2
configure.ac
View file

@ -261,7 +261,7 @@ AS_IF([test "x$enable_systemd" = "xyes"],
AC_MSG_NOTICE([Running qmake to generate the makefile...])
CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro
$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"
ret="$?"

18
winconf-mingw.pri
View file

@ -22,17 +22,17 @@ RC_FILE = qbittorrent_mingw.rc
# Adapt the lib names/versions accordingly
CONFIG(debug, debug|release) {
LIBS += libtorrent \
libboost_system-mgw45-mt-d-1_47 \
libboost_filesystem-mgw45-mt-d-1_47 \
libboost_thread-mgw45-mt-d-1_47
LIBS += libtorrent-rasterbar \
libboost_system-mt \
libboost_filesystem-mt \
libboost_thread_win32-mt
} else {
LIBS += libtorrent \
libboost_system-mgw45-mt-1_47 \
libboost_filesystem-mgw45-mt-1_47 \
libboost_thread-mgw45-mt-1_47
LIBS += libtorrent-rasterbar \
libboost_system-mt \
libboost_filesystem-mt \
libboost_thread_win32-mt
}
LIBS += libadvapi32 libshell32 libuser32
LIBS += libcrypto.dll libssl.dll libwsock32 libws2_32 libz libiconv.dll
LIBS += libcrypto libssl libwsock32 libws2_32 libz libiconv
LIBS += libpowrprof

4
winconf.pri
View file

@ -12,7 +12,7 @@ INCLUDEPATH += $$quote(C:/qBittorrent/openssl/include)
# Point this to the boost lib folder
LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib)
# Point this to the libtorrent lib folder
LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/<path-according-to-the-build-options-chosen>)
LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/path-according-to-the-build-options-chosen)
# Point this to the zlib lib folder
LIBS += $$quote(-LC:/qBittorrent/Zlib/lib)
# Point this to the openssl lib folder
@ -53,7 +53,7 @@ CONFIG(debug, debug|release) {
# Enable backtrace support
CONFIG += strace_win
win32-g++ {
win32-g++* {
include(winconf-mingw.pri)
}
else {