Several compilation and execution fixes for Windows and OS/2

Cleaner binutils gold linker support
This commit is contained in:
Christophe Dumez
2010-03-30 11:39:40 +00:00
parent 7f27d10735
commit 990a863d41
10 changed files with 122 additions and 42 deletions

View File

@@ -11,7 +11,7 @@ CONFIG += qt \
thread
# Update this VERSION for each release
DEFINES += VERSION=\\\"v2.2.2\\\"
DEFINES += VERSION=\'\"v2.2.2\"\'
DEFINES += VERSION_MAJOR=2
DEFINES += VERSION_MINOR=2
DEFINES += VERSION_BUGFIX=2
@@ -100,8 +100,10 @@ else:TARGET = qbittorrent
# QMAKE_CXXFLAGS_RELEASE += -fwrapv
# QMAKE_CXXFLAGS_DEBUG += -fwrapv
unix:QMAKE_LFLAGS_SHAPP += -rdynamic
CONFIG += link_pkgconfig
PKGCONFIG += "libtorrent-rasterbar"
unix {
CONFIG += link_pkgconfig
PKGCONFIG += "libtorrent-rasterbar"
}
QT += network
!contains(DEFINES, DISABLE_GUI):QT += xml
@@ -121,11 +123,22 @@ win32:LIBS += -lssl32 \
-ladvapi32 \
-lwinmm
os2:LIBS += -ltorrent-rasterbar \
-lcurl \
-lboost_thread \
-lboost_system \
-lboost_filesystem \
-lssl -lcrypto -lidn -lpthread
!contains(DEFINES, DISABLE_GUI) {
win32 {
DEFINES += WITH_GEOIP_EMBEDDED
message("On Windows, GeoIP database must be embedded.")
}
os2 {
DEFINES += WITH_GEOIP_EMBEDDED
message("On eCS(OS/2), GeoIP database must be embedded.")
}
macx {
DEFINES += WITH_GEOIP_EMBEDDED
message("On Mac OS X, GeoIP database must be embedded.")