From 535502196baf2ccce7d64d8a92f7a8bf249a6e92 Mon Sep 17 00:00:00 2001 From: lotodore Date: Thu, 17 Nov 2011 19:24:06 +0000 Subject: [PATCH] Still trying to fix the build. --- pokerth_game.pro | 3 ++- pokerth_lib.pro | 2 +- pokerth_server.pro | 4 ++-- src/net/common/uploaderthread.cpp | 6 +++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pokerth_game.pro b/pokerth_game.pro index 3fac95f9..09a4174e 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -19,7 +19,7 @@ QMAKE_CXXFLAGS += -std=gnu++0x UI_DIR = uics MOC_DIR = mocs OBJECTS_DIR = obj -DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_VERSION=3 BOOST_FILESYSTEM_DEPRECATED +DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_DEPRECATED DEFINES += PREFIX=\"$${PREFIX}\" TARGET = pokerth @@ -329,6 +329,7 @@ win32 { -lSDLmain \ -ltinyxml \ -lz \ + -lssh2 \ -lgnutls \ -lgcrypt \ -lgpg-error \ diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 2adbf070..8f4ef138 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -13,7 +13,7 @@ TARGET = lib/pokerth_lib QMAKE_CLEAN += ./lib/libpokerth_lib.a MOC_DIR = mocs OBJECTS_DIR = obj -DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_VERSION=3 BOOST_FILESYSTEM_DEPRECATED +DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_DEPRECATED QT -= core gui QMAKE_CXXFLAGS += -std=gnu++0x #PRECOMPILED_HEADER = src/pch_lib.h diff --git a/pokerth_server.pro b/pokerth_server.pro index d8b7bddb..79781e54 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -14,7 +14,7 @@ TARGET = bin/pokerth_server MOC_DIR = mocs OBJECTS_DIR = obj DEFINES += POKERTH_DEDICATED_SERVER -DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_VERSION=3 BOOST_FILESYSTEM_DEPRECATED +DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_DEPRECATED DEFINES += PREFIX=\"$${PREFIX}\" QT -= core gui QMAKE_CXXFLAGS += -std=gnu++0x @@ -131,7 +131,7 @@ win32 { debug:LIBPATH += debug/lib release:LIBPATH += release/lib - LIBS += -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn -ltinyxml + LIBS += -lssh2 -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn -ltinyxml win32-g++-cross { LIBS += -lsqlite3 LIBS += -lntlm diff --git a/src/net/common/uploaderthread.cpp b/src/net/common/uploaderthread.cpp index a4fe3711..4ed47d0a 100644 --- a/src/net/common/uploaderthread.cpp +++ b/src/net/common/uploaderthread.cpp @@ -67,7 +67,11 @@ UploaderThread::Main() } if (!data.filename.empty() && data.filesize > 0) { path filepath(data.filename); - m_uploadHelper->Init(data.address + filepath.leaf().c_str(), filepath.file_string(), data.user, data.pwd, data.filesize); +#if BOOST_FILESYSTEM_VERSION != 3 + m_uploadHelper->Init(data.address + filepath.leaf(), filepath.file_string(), data.user, data.pwd, data.filesize); +#else + m_uploadHelper->Init(data.address + filepath.filename().string(), filepath.file_string(), data.user, data.pwd, data.filesize); +#endif m_uploadInProgress = true; } }