From f8474c02f76b1f4bebf5f5b596e1127141a47072 Mon Sep 17 00:00:00 2001 From: Albert Medela Date: Sat, 15 Apr 2017 23:17:53 +0200 Subject: [PATCH] add boost_chrono, unless c++11 --- pokerth.pro | 0 pokerth_common.pro | 27 +++++++++++++++++++++++++++ pokerth_db.pro | 3 +++ pokerth_dbofficial.pro | 3 +++ pokerth_game.pro | 29 ++++++++++++++++++++++++++++- pokerth_lib.pro | 3 +++ pokerth_protocol.pro | 3 +++ pokerth_server.pro | 28 +++++++++++++++++++++++++--- src/game_defs.h | 2 +- 9 files changed, 93 insertions(+), 5 deletions(-) mode change 100755 => 100644 pokerth.pro create mode 100644 pokerth_common.pro diff --git a/pokerth.pro b/pokerth.pro old mode 100755 new mode 100644 diff --git a/pokerth_common.pro b/pokerth_common.pro new file mode 100644 index 00000000..34755018 --- /dev/null +++ b/pokerth_common.pro @@ -0,0 +1,27 @@ +# QMake pro-file for PokerTH + +!c++11 { + system( $$QMAKE_CXX -dumpversion | grep -e "^6.[0-9]" > /dev/null ) { + greaterThan(QT_MAJOR_VERSION, 5) | equals(QT_MAJOR_VERSION, 5) { + CONFIG += c++11 + } + else { + equals(QT_MAJOR_VERSION, 4) : greaterThan(QT_MINOR_VERSION, 7) { + CONFIG += "c++11" + QMAKE_CXXFLAGS += "-std=gnu++11" + } + else { + error (QT must be greater and 4.8+) + } + } + } +} + +c++11 { + !system( $$QMAKE_CXX -dumpversion | grep -e "^6.[0-9]" > /dev/null ) { + equals(QT_MAJOR_VERSION, 4) : greaterThan(QT_MINOR_VERSION, 7) { + QMAKE_CXXFLAGS += "-std=gnu++11" + message(here) + } + } +} diff --git a/pokerth_db.pro b/pokerth_db.pro index 7c2d1428..0a7a9b72 100644 --- a/pokerth_db.pro +++ b/pokerth_db.pro @@ -17,6 +17,9 @@ DEFINES += ENABLE_IPV6 TIXML_USE_STL QT -= core gui #PRECOMPILED_HEADER = src/pch_lib.h +# Check for c++11 +include(pokerth_common.pro) + INCLUDEPATH += . \ src diff --git a/pokerth_dbofficial.pro b/pokerth_dbofficial.pro index 6dd7a128..1e646bb3 100644 --- a/pokerth_dbofficial.pro +++ b/pokerth_dbofficial.pro @@ -14,6 +14,9 @@ OBJECTS_DIR = obj QT -= core \ gui +# Check for c++11 +include(pokerth_common.pro) + # PRECOMPILED_HEADER = dbofficial/pch_lib.h INCLUDEPATH += . \ ./src diff --git a/pokerth_game.pro b/pokerth_game.pro index 581ad33c..122be9df 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -26,6 +26,9 @@ DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_DEPRECATED DEFINES += PREFIX=\"$${PREFIX}\" TARGET = pokerth +# Check for c++11 +include(pokerth_common.pro) + # PRECOMPILED_HEADER = src/pch_game.h android{ @@ -427,6 +430,8 @@ unix:!mac { boost_system-mt BOOST_RANDOM = boost_random \ boost_random-mt + BOOST_CHRONO = boost_chrono \ + boost_chrono-mt # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) # to override the default '/usr' pass PREFIX @@ -482,15 +487,37 @@ unix:!mac { message("Found $$lib") BOOST_SYS = -l$$lib } + !c++11 { + for(lib, BOOST_CHRONO):exists($${dir}/lib$${lib}.so*) { + message("Found $$lib") + BOOST_CHRONO = -l$$lib + } + for(lib, BOOST_CHRONO):exists($${dir}/lib$${lib}.a) { + message("Found $$lib") + BOOST_CHRONO = -l$$lib + } + } } !android{ - BOOST_LIBS = $$BOOST_THREAD \ + c++11 { + BOOST_LIBS = $$BOOST_THREAD \ $$BOOST_FS \ $$BOOST_IOSTREAMS \ $$BOOST_REGEX \ $$BOOST_RANDOM \ $$BOOST_SYS !count(BOOST_LIBS, 6):error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } + !c++11 { + BOOST_LIBS = $$BOOST_THREAD \ + $$BOOST_FS \ + $$BOOST_IOSTREAMS \ + $$BOOST_REGEX \ + $$BOOST_RANDOM \ + $$$$BOOST_SYS \ + $$BOOST_CHRONO + !count(BOOST_LIBS, 7):error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } if($$system(sdl-config --version)):error("sdl-config not found in PATH - libSDL_mixer, libSDL are required!") UNAME = $$system(uname -s) BSD = $$find(UNAME, "BSD") diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 2c056cfa..37577ac4 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -17,6 +17,9 @@ DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_DEPRECATED QT -= core gui #PRECOMPILED_HEADER = src/pch_lib.h +# Check for c++11 +include(pokerth_common.pro) + INCLUDEPATH += . \ src \ src/engine \ diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro index 03fb36ce..6f29c786 100644 --- a/pokerth_protocol.pro +++ b/pokerth_protocol.pro @@ -17,6 +17,9 @@ QT -= core \ gui # PRECOMPILED_HEADER = src/pch_lib.h +# Check for c++11 +include(pokerth_common.pro) + INCLUDEPATH += . \ src DEPENDPATH += . \ diff --git a/pokerth_server.pro b/pokerth_server.pro index 05bca1c4..0c632b55 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -19,6 +19,9 @@ DEFINES += PREFIX=\"$${PREFIX}\" QT -= core gui #PRECOMPILED_HEADER = src/pch_lib.h +# Check for c++11 +include(pokerth_common.pro) + INCLUDEPATH += . \ src \ src/engine \ @@ -185,6 +188,7 @@ unix : !mac { BOOST_SYS = boost_system boost_system-mt BOOST_REGEX = boost_regex boost_regex-mt BOOST_RANDOM = boost_random boost_random-mt + BOOST_CHRONO = boost_chrono boost_chrono-mt # # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) @@ -249,11 +253,29 @@ unix : !mac { message("Found $$lib") BOOST_SYS = -l$$lib } + !c++11 { + for(lib, BOOST_CHRONO):exists($${dir}/lib$${lib}.so*) { + message("Found $$lib") + BOOST_CHRONO = -l$$lib + } + for(lib, BOOST_CHRONO):exists($${dir}/lib$${lib}.a) { + message("Found $$lib") + BOOST_CHRONO = -l$$lib + } + } } } - BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_RANDOM $$BOOST_SYS - !count(BOOST_LIBS, 7){ - error("Unable to find boost libraries in PREFIX=$${PREFIX}") + c++11 { + BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_RANDOM $$BOOST_SYS + !count(BOOST_LIBS, 7){ + error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } + } + !c++11 { + BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_RANDOM $$BOOST_SYS $$BOOST_CHRONO + !count(BOOST_LIBS, 8){ + error("Unable to find boost libraries in PREFIX=$${PREFIX}") + } } UNAME = $$system(uname -s) diff --git a/src/game_defs.h b/src/game_defs.h index 41710b0f..7890b6ae 100644 --- a/src/game_defs.h +++ b/src/game_defs.h @@ -46,7 +46,7 @@ #define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR) #define POKERTH_BETA_REVISION 0 -#define POKERTH_BETA_RELEASE_STRING "1.1.1" +#define POKERTH_BETA_RELEASE_STRING "1.1.2" #define SQLITE_LOG_VERSION 1