mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-03-09 11:51:03 +00:00
Merge pull request #3228 from Chocobo1/win_build
Compilation on windows
This commit is contained in:
commit
0209a9f41d
9
.gitignore
vendored
9
.gitignore
vendored
@ -2,13 +2,19 @@ src/gui/geoip/GeoIP.dat
|
||||
src/gui/geoip/GeoIP.dat.gz
|
||||
src/qbittorrent
|
||||
src/qbittorrent-nox
|
||||
src/release
|
||||
src/debug
|
||||
qbittorrent.pro.user*
|
||||
conf.pri
|
||||
Makefile
|
||||
Makefile*
|
||||
*.pyc
|
||||
*.log
|
||||
|
||||
# Compiled object files
|
||||
*.o
|
||||
*.pdb
|
||||
*.exe
|
||||
|
||||
# Generated MOC, resource and UI files
|
||||
moc_*.cpp
|
||||
qrc_*.cpp
|
||||
@ -19,6 +25,7 @@ src/lang/qbittorrent_*.qm
|
||||
.qmake.stash
|
||||
src/qbittorrent.app
|
||||
*.dmg
|
||||
|
||||
#Autotools junk
|
||||
aclocal.m4
|
||||
autom4te.cache/*
|
||||
|
@ -1,5 +1,5 @@
|
||||
strace_win:{
|
||||
contains(QMAKE_HOST.arch, x86):{
|
||||
strace_win{
|
||||
contains(QMAKE_HOST.arch, x86) {
|
||||
# i686 arch requires frame pointer preservation
|
||||
QMAKE_CXXFLAGS_RELEASE += -fno-omit-frame-pointer
|
||||
QMAKE_CXXFLAGS_DEBUG += -fno-omit-frame-pointer
|
||||
@ -17,11 +17,7 @@ CONFIG(debug, debug|release) {
|
||||
|
||||
RC_FILE = qbittorrent_mingw.rc
|
||||
|
||||
#You need to link with libtorrent > 0.15.5 (or svn) and you must
|
||||
#configure libtorrent to use iconv in the building process. This is
|
||||
#needed for correct Unicode support.
|
||||
|
||||
#Adapt the lib names/versions accordingly
|
||||
# Adapt the lib names/versions accordingly
|
||||
CONFIG(debug, debug|release) {
|
||||
LIBS += libtorrent \
|
||||
libboost_system-mgw45-mt-d-1_47 \
|
||||
|
@ -1,10 +1,10 @@
|
||||
strace_win:{
|
||||
contains(QMAKE_HOST.arch, x86):{
|
||||
strace_win {
|
||||
contains(QMAKE_HOST.arch, x86) {
|
||||
# i686 arch requires frame pointer preservation
|
||||
QMAKE_CXXFLAGS_RELEASE += -Oy-
|
||||
QMAKE_CXXFLAGS_DEBUG += -Oy-
|
||||
}
|
||||
release:{
|
||||
release {
|
||||
QMAKE_CXXFLAGS_RELEASE += -Zi
|
||||
QMAKE_LFLAGS += "/DEBUG"
|
||||
}
|
||||
@ -18,7 +18,7 @@ RC_FILE = qbittorrent.rc
|
||||
# Enable Wide characters
|
||||
DEFINES += TORRENT_USE_WPATH
|
||||
|
||||
#Adapt the lib names/versions accordingly
|
||||
# Adapt the lib names/versions accordingly
|
||||
CONFIG(debug, debug|release) {
|
||||
LIBS += libtorrentd.lib \
|
||||
libboost_system-vc90-mt-sgd-1_51.lib
|
||||
|
18
winconf.pri
18
winconf.pri
@ -1,18 +1,22 @@
|
||||
# Adapt these paths on Windows
|
||||
|
||||
#Point this to the boost include folder
|
||||
# Point this to the boost include folder
|
||||
INCLUDEPATH += $$quote(C:/qBittorrent/boost_1_51_0)
|
||||
#Point this to the libtorrent include folder
|
||||
# Point this to the libtorrent include folder
|
||||
INCLUDEPATH += $$quote(C:/qBittorrent/RC_0_16/include)
|
||||
#Point this to the zlib include folder
|
||||
# Point this to the zlib include folder
|
||||
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
|
||||
# Point this to the boost lib folder
|
||||
LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib)
|
||||
#Point this to the libtorrent lib folder
|
||||
# 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
|
||||
# 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
|
||||
@ -39,7 +43,7 @@ CONFIG(debug, debug|release) {
|
||||
DEFINES += NDEBUG
|
||||
}
|
||||
|
||||
#Enable backtrace support
|
||||
# Enable backtrace support
|
||||
CONFIG += strace_win
|
||||
|
||||
win32-g++ {
|
||||
|
Loading…
x
Reference in New Issue
Block a user