From 316f2f43c3a907916b15d87327c2c4b72118dbe8 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sat, 29 Mar 2014 20:33:21 +0100 Subject: [PATCH] Adding libboost-chrono dependency on Mac/Linux. --- pokerth_game.pro | 15 ++++++++++++++- pokerth_server.pro | 14 ++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/pokerth_game.pro b/pokerth_game.pro index d660452e..01ebe39d 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -422,6 +422,8 @@ unix:!mac { boost_iostreams-mt BOOST_REGEX = boost_regex \ boost_regex-mt + BOOST_CHRONO = boost_chrono \ + boost_chrono-mt BOOST_SYS = boost_system \ boost_system-mt BOOST_RANDOM = boost_random \ @@ -463,6 +465,14 @@ unix:!mac { message("Found $$lib") BOOST_REGEX = -l$$lib } + 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{ for(lib, BOOST_RANDOM):exists($${dir}/lib$${lib}.so*) { message("Found $$lib") @@ -487,9 +497,10 @@ unix:!mac { $$BOOST_FS \ $$BOOST_IOSTREAMS \ $$BOOST_REGEX \ + $$BOOST_CHRONO \ $$BOOST_RANDOM \ $$BOOST_SYS - !count(BOOST_LIBS, 6):error("Unable to find boost libraries in PREFIX=$${PREFIX}") + !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") @@ -509,6 +520,7 @@ unix:!mac { $$BOOST_FS \ $$BOOST_IOSTREAMS \ $$BOOST_REGEX \ + $$BOOST_CHRONO \ $$BOOST_SYS !count(BOOST_LIBS, 5):error("Unable to find boost libraries in PREFIX=$${PREFIX}/armv5") LIBS += -ltinyxml @@ -575,6 +587,7 @@ mac { LIBS += /usr/local/lib/libboost_thread.a LIBS += /usr/local/lib/libboost_filesystem.a LIBS += /usr/local/lib/libboost_regex.a + LIBS += /usr/local/lib/libboost_chrono.a LIBS += /usr/local/lib/libboost_random.a LIBS += /usr/local/lib/libboost_system.a LIBS += /usr/local/lib/libboost_iostreams.a diff --git a/pokerth_server.pro b/pokerth_server.pro index 706475f7..f36031c7 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -180,6 +180,7 @@ unix : !mac { BOOST_THREAD = boost_thread boost_thread-mt BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt + BOOST_CHRONO = boost_chrono boost_chrono-mt BOOST_SYS = boost_system boost_system-mt BOOST_REGEX = boost_regex boost_regex-mt BOOST_RANDOM = boost_random boost_random-mt @@ -231,6 +232,14 @@ unix : !mac { message("Found $$lib") BOOST_REGEX = -l$$lib } + 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 + } for(lib, BOOST_RANDOM):exists($${dir}/lib$${lib}.so*) { message("Found $$lib") BOOST_RANDOM = -l$$lib @@ -249,8 +258,8 @@ unix : !mac { } } } - BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_RANDOM $$BOOST_SYS - !count(BOOST_LIBS, 7){ + BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_CHRONO $$BOOST_RANDOM $$BOOST_SYS + !count(BOOST_LIBS, 8){ error("Unable to find boost libraries in PREFIX=$${PREFIX}") } @@ -301,6 +310,7 @@ mac { LIBS += /usr/local/lib/libboost_thread.a LIBS += /usr/local/lib/libboost_filesystem.a LIBS += /usr/local/lib/libboost_regex.a + LIBS += /usr/local/lib/libboost_chrono.a LIBS += /usr/local/lib/libboost_random.a LIBS += /usr/local/lib/libboost_system.a LIBS += /usr/local/lib/libboost_iostreams.a