Windows execution fixes

This commit is contained in:
Christophe Dumez
2010-05-30 17:51:40 +00:00
parent 58a36f7cfd
commit 338d4fd31e
11 changed files with 164 additions and 53 deletions

View File

@@ -22,7 +22,7 @@ DEFINES += VERSION_BUGFIX=0
win32 {
# Adapt these paths on Windows
INCLUDEPATH += $$quote(C:/qbittorrent/boost_1_40_0)
INCLUDEPATH += $$quote(C:/qbittorrent/boost_1_42_0)
INCLUDEPATH += $$quote(C:/qbittorrent/libtorrent-rasterbar-0.14.10/include)
INCLUDEPATH += $$quote(C:/qbittorrent/libtorrent-rasterbar-0.14.10/zlib)
@@ -133,27 +133,27 @@ DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
# win32:LIBS += -ltorrent -lboost_system
# win32:LIBS += -lz ?
win32 {
LIBS += -lssleay32 \
-leay32 \
-lws2_32 \
-lwsock32 \
-ladvapi32 \
-lwinmm
# Adapt these paths on Windows
LIBS += C:/qbittorrent/libs/libtorrent.lib \
C:/qbittorrent/libs/libboost_system.lib \
C:/qbittorrent/libs/libboost_filesystem.lib \
C:/qbittorrent/libs/libboost_thread.lib \
C:/Qt/2010.02.1/mingw/lib/*.a \
C:/Qt/2010.02.1/mingw/lib/libssleay32.a \
C:/Qt/2010.02.1/mingw/lib/libeay32.a \
C:/Qt/2010.02.1/mingw/lib/libws2_32.a \
C:/qbittorrent/libs/libboost_system-mgw44-mt-s.lib \
C:/qbittorrent/libs/libboost_filesystem-mgw44-mt-s.lib \
C:/qbittorrent/libs/libboost_thread-mgw44-mt-s.lib \
C:/OpenSSL/lib/MinGW/ssleay32.a \
C:/OpenSSL/lib/MinGW/libeay32.a \
C:/Qt/2010.02.1/mingw/lib/libwsock32.a \
C:/Qt/2010.02.1/mingw/lib/libadvapi32.a \
C:/Qt/2010.02.1/mingw/lib/libwinmm.a \
C:/Qt/2010.02.1/mingw/lib/libgdi32.a \
-LC:/Qt/2010.02.1/mingw/lib/
C:/Qt/2010.02.1/mingw/lib/libws2_32.a #\
# -LC:/Qt/2010.02.1/mingw/lib/
# C:/Qt/2010.02.1/mingw/lib/libadvapi32.a \
# C:/Qt/2010.02.1/mingw/lib/libwinmm.a \
# C:/Qt/2010.02.1/mingw/lib/libgdi32.a \
# LIBS += -lssleay32 \
# -leay32 \
# -lws2_32 \
# -lwsock32 \
# -ladvapi32 \
# -lwinmm
}
os2:LIBS += -ltorrent-rasterbar \
@@ -177,6 +177,12 @@ os2:LIBS += -ltorrent-rasterbar \
}
unix:!macx:contains(DEFINES, WITH_GEOIP_EMBEDDED):message("You chose to embed GeoIP database in qBittorrent executable.")
# Resource files
RESOURCES = icons.qrc \
lang.qrc \
search.qrc \
webui.qrc
# Add GeoIP resource file if the GeoIP database
# should be embedded in qBittorrent executable
contains(DEFINES, WITH_GEOIP_EMBEDDED) {
@@ -192,12 +198,6 @@ os2:LIBS += -ltorrent-rasterbar \
else:message("GeoIP database will not be embedded in qBittorrent executable.")
}
# Resource files
RESOURCES = icons.qrc \
lang.qrc \
search.qrc \
webui.qrc
# Translations
TRANSLATIONS = $$LANG_PATH/qbittorrent_fr.ts \
$$LANG_PATH/qbittorrent_zh.ts \