From 58a36f7cfdec802acae1164b2c7ec013d71dac8f Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Fri, 28 May 2010 22:03:30 +0000 Subject: [PATCH] Windows compilation Fix --- src/src.pro | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/src.pro b/src/src.pro index bf7e6b117..b2289dcb2 100644 --- a/src/src.pro +++ b/src/src.pro @@ -11,17 +11,22 @@ CONFIG += qt \ thread # Update this VERSION for each release -DEFINES += VERSION=\'\"v2.3.0beta1\"\' +os2 { + DEFINES += VERSION=\'\"v2.3.0beta1\'\" +} else { + DEFINES += VERSION=\\\"v2.3.0beta1\\\" +} DEFINES += VERSION_MAJOR=2 DEFINES += VERSION_MINOR=3 DEFINES += VERSION_BUGFIX=0 win32 { # Adapt these paths on Windows - INCLUDEPATH += $$quote(D:/librarys/boost_1_42_0) - INCLUDEPATH += $$quote(D:/librarys/libtorrent-rasterbar-0.14.9/include) + INCLUDEPATH += $$quote(C:/qbittorrent/boost_1_40_0) + INCLUDEPATH += $$quote(C:/qbittorrent/libtorrent-rasterbar-0.14.10/include) + INCLUDEPATH += $$quote(C:/qbittorrent/libtorrent-rasterbar-0.14.10/zlib) - DEFINES += _WIN32_WINNT=0x0501 + DEFINES += _WIN32_WINNT=0x0601 DEFINES += _WIN32_IE=0x0400 DEFINES += _WIN32_WINDOWS } @@ -128,35 +133,30 @@ DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS # win32:LIBS += -ltorrent -lboost_system # win32:LIBS += -lz ? win32 { - LIBS += -lssl \ + LIBS += -lssleay32 \ + -leay32 \ -lws2_32 \ -lwsock32 \ -ladvapi32 \ -lwinmm # Adapt these paths on Windows - LIBS += C:/boost_1_42_0/lib/libboost_filesystem-mgw44-mt.lib \ - C:/boost_1_42_0/lib/libboost_program_options-mgw44-mt.lib \ - C:/boost_1_42_0/lib/libboost_system-mgw44-mt.lib \ - C:/boost_1_42_0/lib/libboost_thread-mgw44-mt.lib \ + 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/libboost_thread.lib \ - C:/Qt/2010.02.1/mingw/lib/libssl.a \ - C:/Qt/2010.02.1/mingw/lib/libcrypto.a \ - C:/Qt/2010.02.1/mingw/lib/libssl.dll.a \ - C:/Qt/2010.02.1/mingw/lib/libcrypto.dll.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:/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/ - - LIBS += -ltorrent-rasterbar } os2:LIBS += -ltorrent-rasterbar \ - -lcurl \ -lboost_thread \ -lboost_system \ -lboost_filesystem \