sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Still trying to fix the build.

Browse Source
This commit is contained in:
lotodore
2011-11-17 19:24:06 +00:00
parent 90d6955efd
commit 535502196b
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+2 -1
View File
@@ -19,7 +19,7 @@ QMAKE_CXXFLAGS += -std=gnu++0x
UI_DIR = uics UI_DIR = uics
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj 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}\" DEFINES += PREFIX=\"$${PREFIX}\"
TARGET = pokerth TARGET = pokerth
@@ -329,6 +329,7 @@ win32 {
-lSDLmain \ -lSDLmain \
-ltinyxml \ -ltinyxml \
-lz \ -lz \
-lssh2 \
-lgnutls \ -lgnutls \
-lgcrypt \ -lgcrypt \
-lgpg-error \ -lgpg-error \
pokerth_lib.pro
+1 -1
View File
@@ -13,7 +13,7 @@ TARGET = lib/pokerth_lib
QMAKE_CLEAN += ./lib/libpokerth_lib.a QMAKE_CLEAN += ./lib/libpokerth_lib.a
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj 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 QT -= core gui
QMAKE_CXXFLAGS += -std=gnu++0x QMAKE_CXXFLAGS += -std=gnu++0x
#PRECOMPILED_HEADER = src/pch_lib.h #PRECOMPILED_HEADER = src/pch_lib.h
pokerth_server.pro
+2 -2
View File
@@ -14,7 +14,7 @@ TARGET = bin/pokerth_server
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
DEFINES += POKERTH_DEDICATED_SERVER 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}\" DEFINES += PREFIX=\"$${PREFIX}\"
QT -= core gui QT -= core gui
QMAKE_CXXFLAGS += -std=gnu++0x QMAKE_CXXFLAGS += -std=gnu++0x
@@ -131,7 +131,7 @@ win32 {
debug:LIBPATH += debug/lib debug:LIBPATH += debug/lib
release:LIBPATH += release/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 { win32-g++-cross {
LIBS += -lsqlite3 LIBS += -lsqlite3
LIBS += -lntlm LIBS += -lntlm
src/net/common/uploaderthread.cpp
+5 -1
View File
@@ -67,7 +67,11 @@ UploaderThread::Main()
} }
if (!data.filename.empty() && data.filesize > 0) { if (!data.filename.empty() && data.filesize > 0) {
path filepath(data.filename); 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; m_uploadInProgress = true;
} }
} }