From 1150d08a8a961f38c191c937e4f897614f8e0958 Mon Sep 17 00:00:00 2001 From: doitux Date: Tue, 1 Jun 2010 20:08:33 +0000 Subject: [PATCH] libboost_system missing fedora bugfix (thx to vdw) --- pokerth_game.pro | 11 +++++++++-- pokerth_server.pro | 12 ++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pokerth_game.pro b/pokerth_game.pro index 7e150029..39c717a0 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -373,6 +373,8 @@ unix:!mac { boost_iostreams-mt BOOST_REGEX = boost_regex \ boost_regex-mt + BOOST_SYS = boost_system \ + boost_system-mt # searching in $PREFIX/lib and $PREFIX/lib64 # to override the default '/usr' pass PREFIX @@ -394,12 +396,17 @@ unix:!mac { message("Found $$lib") BOOST_REGEX = -l$$lib } + for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) { + message("Found $$lib") + BOOST_SYS = -l$$lib + } } BOOST_LIBS = $$BOOST_THREAD \ $$BOOST_FS \ $$BOOST_IOSTREAMS \ - $$BOOST_REGEX - !count(BOOST_LIBS, 4):error("Unable to find boost libraries in PREFIX=$${PREFIX}") + $$BOOST_REGEX \ + $$BOOST_SYS + !count(BOOST_LIBS, 5):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_server.pro b/pokerth_server.pro index 415a9e5b..3ec128a7 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -187,8 +187,10 @@ 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_SYS = boost_system boost_system-mt BOOST_REGEX = boost_regex boost_regex-mt + # # searching in $PREFIX/lib and $PREFIX/lib64 # to override the default '/usr' pass PREFIX @@ -226,10 +228,16 @@ unix : !mac { BOOST_REGEX = -l$$lib } } + for(lib, BOOST_SYS){ + exists($${dir}/lib$${lib}.so*){ + message("Found $$lib") + BOOST_SYS = -l$$lib + } + } } } - BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX - !count(BOOST_LIBS, 5){ + BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_SYS + !count(BOOST_LIBS, 6){ error("Unable to find boost libraries in PREFIX=$${PREFIX}") }