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

Merge pull request #4 from pokerth/stable

Browse Source 
Stable
This commit is contained in:
albmed
2019-03-20 16:36:00 +01:00
committed by GitHub
parent 3813664b94 09281f3179
commit 21b8088ecf
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connectivity.pro
+2 -2
View File
@@ -41,13 +41,13 @@ unix : !mac {
QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
INCLUDEPATH += $${PREFIX}/include INCLUDEPATH += $${PREFIX}/include
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
BOOST_SYS = boost_system boost_system-mt BOOST_SYS = boost_system boost_system-mt
# #
# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) # searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
# to override the default '/usr' pass PREFIX # to override the default '/usr' pass PREFIX
# variable to qmake. # variable to qmake.
# #
load.pro
+2 -2
View File
@@ -42,14 +42,14 @@ unix : !mac {
QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
INCLUDEPATH += $${PREFIX}/include INCLUDEPATH += $${PREFIX}/include
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
BOOST_THREAD = boost_thread boost_thread-mt BOOST_THREAD = boost_thread boost_thread-mt
BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
BOOST_SYS = boost_system boost_system-mt BOOST_SYS = boost_system boost_system-mt
# #
# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) # searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
# to override the default '/usr' pass PREFIX # to override the default '/usr' pass PREFIX
# variable to qmake. # variable to qmake.
# #
pokerth_game.pro
+2 -2
View File
@@ -412,7 +412,7 @@ unix:!mac {
LIB_DIRS = $${PREFIX}/lib \ LIB_DIRS = $${PREFIX}/lib \
$${PREFIX}/lib64 \ $${PREFIX}/lib64 \
$${PREFIX}/lib/x86_64-linux-gnu \ $${PREFIX}/lib/x86_64-linux-gnu \
$$system(qmake -query QT_INSTALL_LIBS) $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
} }
android{ android{
LIBPATH += $${PREFIX}/lib/armv7 LIBPATH += $${PREFIX}/lib/armv7
@@ -433,7 +433,7 @@ unix:!mac {
BOOST_CHRONO = boost_chrono \ BOOST_CHRONO = boost_chrono \
boost_chrono-mt boost_chrono-mt
# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) # searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
# to override the default '/usr' pass PREFIX # to override the default '/usr' pass PREFIX
# variable to qmake. # variable to qmake.
for(dir, LIB_DIRS):exists($$dir) { for(dir, LIB_DIRS):exists($$dir) {
pokerth_server.pro
+2 -2
View File
@@ -180,7 +180,7 @@ unix : !mac {
INCLUDEPATH += $${PREFIX}/include INCLUDEPATH += $${PREFIX}/include
# see issue https://github.com/pokerth/pokerth/issues/282 # see issue https://github.com/pokerth/pokerth/issues/282
INCLUDEPATH += $${PREFIX}/include/libircclient INCLUDEPATH += $${PREFIX}/include/libircclient
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
BOOST_FS = boost_filesystem boost_filesystem-mt BOOST_FS = boost_filesystem boost_filesystem-mt
BOOST_THREAD = boost_thread boost_thread-mt BOOST_THREAD = boost_thread boost_thread-mt
BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
@@ -191,7 +191,7 @@ unix : !mac {
BOOST_CHRONO = boost_chrono boost_chrono-mt BOOST_CHRONO = boost_chrono boost_chrono-mt
# #
# searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) # searching in $PREFIX/lib, $PREFIX/lib64 and $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
# to override the default '/usr' pass PREFIX # to override the default '/usr' pass PREFIX
# variable to qmake. # variable to qmake.
# #
src/net/serveraccepthelper.h
+1 -1
View File
@@ -125,7 +125,7 @@ protected:
// Deprecated non_blocking_io command // Deprecated non_blocking_io command
/*boost::asio::socket_base::non_blocking_io command(true); /*boost::asio::socket_base::non_blocking_io command(true);
newSock->io_control(command);*/ newSock->io_control(command);*/
newSock->non_blocking(true); acceptedSocket->non_blocking(true);
acceptedSocket->set_option(typename P::no_delay(true)); acceptedSocket->set_option(typename P::no_delay(true));
acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true)); acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));
boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService)); boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));
ts/pokerth_fr.ts
+4 -4
View File
@@ -17,17 +17,17 @@
<message> <message>
<location filename="../src/gui/qt/styles/carddeckstylereader.cpp" line="201"/> <location filename="../src/gui/qt/styles/carddeckstylereader.cpp" line="201"/>
<source>Some cards pictures are missing, please contact style maintainer for this issue.</source> <source>Some cards pictures are missing, please contact style maintainer for this issue.</source>
<translation>Certaines images des cartes sont manquantes, veuillez contacter l&apos;auteur pour qu&apos;il corrige ce problème.</translation> <translation>Certaines images de cartes sont manquantes, veuillez contacter le mainteneur du style pour qu&apos;il corrige ce problème.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/qt/styles/carddeckstylereader.cpp" line="204"/> <location filename="../src/gui/qt/styles/carddeckstylereader.cpp" line="204"/>
<source>Some style fields are missing, please contact style maintainer for this issue.</source> <source>Some style fields are missing, please contact style maintainer for this issue.</source>
<translation>Certains champs sont manquants, veuillez contacter l&apos;auteur pour lui demander de corriger ce problème.</translation> <translation>Certains champs sont manquants, veuillez contacter le mainteneur du style pour qu&apos;il corrige ce problème.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/qt/styles/carddeckstylereader.cpp" line="207"/> <location filename="../src/gui/qt/styles/carddeckstylereader.cpp" line="207"/>
<source>This style is outdated, please contact style maintainer for this issue.</source> <source>This style is outdated, please contact style maintainer for this issue.</source>
<translation>Ce style est obsolète, veuillez contacter l&apos;auteur pour lui demander de le mettre à jour.</translation> <translation>Ce style est obsolète, veuillez contacter le mainteneur du style pour ce problème.</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/qt/styles/carddeckstylereader.cpp" line="224"/> <location filename="../src/gui/qt/styles/carddeckstylereader.cpp" line="224"/>
@@ -8991,7 +8991,7 @@ Veuillez choisir un nom différent.</translation>
<message> <message>
<location filename="../src/gui/qt/gui_800x480/tabs_800x480.ui" line="503"/> <location filename="../src/gui/qt/gui_800x480/tabs_800x480.ui" line="503"/>
<source>Chance</source> <source>Chance</source>
<translation>Chance</translation> <translation>Probabilité</translation>
</message> </message>
<message> <message>
<location filename="../src/gui/qt/gui_800x480/tabs_800x480.ui" line="608"/> <location filename="../src/gui/qt/gui_800x480/tabs_800x480.ui" line="608"/>
zlib_compress.pro
+1 -1
View File
@@ -48,7 +48,7 @@ unix : !mac {
#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
#QMAKE_LFLAGS += -Wl,--gc-sections #QMAKE_LFLAGS += -Wl,--gc-sections
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
BOOST_FS = boost_filesystem boost_filesystem-mt BOOST_FS = boost_filesystem boost_filesystem-mt
BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt
BOOST_SYSTEM = boost_system boost_system-mt BOOST_SYSTEM = boost_system boost_system-mt