Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- This file is part of MXE.
- See index.html for further information.
- Contains ad hoc patches for cross building.
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Boris Nagaev <bnagaev@gmail.com>
- Date: Sun, 30 Aug 2015 00:28:50 +0200
- Subject: [PATCH] do not check qmake existance
- Fix ./configure error:
- checking for mxe/usr/i686-w64-mingw32.static/qt/bin/qmake...
- configure: error: cannot check for file existence when
- cross compiling
- diff --git a/m4/qbittorrent.m4 b/m4/qbittorrent.m4
- index 1111111..2222222 100644
- --- a/m4/qbittorrent.m4
- +++ b/m4/qbittorrent.m4
- @@ -12,9 +12,9 @@ AC_DEFUN([FIND_QT4],
- [QT_QMAKE=`AS_DIRNAME(["$QT_QMAKE"])`])
- ])
- -AC_CHECK_FILE([$QT_QMAKE/qmake],
- +AS_IF([$QT_QMAKE/qmake],
- [QT_QMAKE="$QT_QMAKE/qmake"],
- - [AC_CHECK_FILE([$QT_QMAKE/qmake-qt4],
- + [AS_IF([$QT_QMAKE/qmake-qt4],
- [QT_QMAKE="$QT_QMAKE/qmake-qt4"],
- [QT_QMAKE=""])
- ])
- @@ -36,7 +36,7 @@ AC_DEFUN([FIND_QT5],
- [host_bins])
- ])
- -AC_CHECK_FILE([$QT_QMAKE/qmake],
- +AS_IF([$QT_QMAKE/qmake],
- [QT_QMAKE="$QT_QMAKE/qmake"],
- [AC_CHECK_FILE([$QT_QMAKE/qmake-qt5],
- [QT_QMAKE="$QT_QMAKE/qmake-qt5"],
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Boris Nagaev <bnagaev@gmail.com>
- Date: Sun, 30 Aug 2015 01:58:17 +0200
- Subject: [PATCH] convert includes like <Windows.h> to lowercase
- diff --git a/src/app/application.cpp b/src/app/application.cpp
- index 1111111..2222222 100644
- --- a/src/app/application.cpp
- +++ b/src/app/application.cpp
- @@ -37,7 +37,7 @@
- #ifndef DISABLE_GUI
- #include "gui/guiiconprovider.h"
- #ifdef Q_OS_WIN
- -#include <Windows.h>
- +#include <windows.h>
- #include <QSharedMemory>
- #include <QSessionManager>
- #endif // Q_OS_WIN
- diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp
- index 1111111..2222222 100644
- --- a/src/base/bittorrent/torrenthandle.cpp
- +++ b/src/base/bittorrent/torrenthandle.cpp
- @@ -43,7 +43,7 @@
- #include <boost/bind.hpp>
- #ifdef Q_OS_WIN
- -#include <Windows.h>
- +#include <windows.h>
- #endif
- #include "base/logger.h"
- diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
- index 1111111..2222222 100644
- --- a/src/base/preferences.cpp
- +++ b/src/base/preferences.cpp
- @@ -47,7 +47,7 @@
- #endif
- #ifdef Q_OS_WIN
- -#include <ShlObj.h>
- +#include <shlobj.h>
- #include <winreg.h>
- #endif
- diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp
- index 1111111..2222222 100644
- --- a/src/base/utils/misc.cpp
- +++ b/src/base/utils/misc.cpp
- @@ -48,7 +48,7 @@
- #ifdef Q_OS_WIN
- #include <windows.h>
- -#include <PowrProf.h>
- +#include <powrprof.h>
- const int UNLEN = 256;
- #else
- #include <unistd.h>
- diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp
- index 1111111..2222222 100644
- --- a/src/gui/powermanagement/powermanagement.cpp
- +++ b/src/gui/powermanagement/powermanagement.cpp
- @@ -40,7 +40,7 @@
- #endif
- #ifdef Q_OS_WIN
- -#include <Windows.h>
- +#include <windows.h>
- #endif
- PowerManagement::PowerManagement(QObject *parent) : QObject(parent), m_busy(false)
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Boris Nagaev <bnagaev@gmail.com>
- Date: Sun, 30 Aug 2015 02:02:39 +0200
- Subject: [PATCH] fix library list
- Replace library list hardcoded in qmake files with
- libraries found by autotools.
- diff --git a/configure b/configure
- index 1111111..2222222 100755
- --- a/configure
- +++ b/configure
- @@ -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" "CONF_LIBS=$LIBS"
- ret="$?"
- diff --git a/winconf-mingw.pri b/winconf-mingw.pri
- index 1111111..2222222 100644
- --- a/winconf-mingw.pri
- +++ b/winconf-mingw.pri
- @@ -20,19 +20,8 @@ CONFIG(debug, debug|release) {
- 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
- -} else {
- - LIBS += libtorrent \
- - libboost_system-mgw45-mt-1_47 \
- - libboost_filesystem-mgw45-mt-1_47 \
- - libboost_thread-mgw45-mt-1_47
- -}
- +LIBS += $$CONF_LIBS
- 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
- diff --git a/winconf.pri b/winconf.pri
- index 1111111..2222222 100644
- --- a/winconf.pri
- +++ b/winconf.pri
- @@ -9,15 +9,6 @@ INCLUDEPATH += $$quote(C:/qBittorrent/Zlib/include)
- # Point this to the openssl include folder
- 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>)
- -# Point this to the zlib lib folder
- -LIBS += $$quote(-LC:/qBittorrent/Zlib/lib)
- -# Point this to the openssl lib folder
- -LIBS += $$quote(-LC:/qBittorrent/openssl/lib)
- -
- # LIBTORRENT DEFINES
- DEFINES += BOOST_ALL_NO_LIB
- DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021
- @@ -46,9 +37,4 @@ CONFIG(debug, debug|release) {
- # Enable backtrace support
- CONFIG += strace_win
- -win32-g++ {
- - include(winconf-mingw.pri)
- -}
- -else {
- - include(winconf-msvc.pri)
- -}
- +include(winconf-mingw.pri)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement