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

libboost_system missing fedora bugfix (thx to vdw)

Browse Source
This commit is contained in:
doitux
2010-06-01 20:08:33 +00:00
parent 6205e28887
commit 1150d08a8a
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+9 -2
View File
@@ -373,6 +373,8 @@ unix:!mac {
boost_iostreams-mt boost_iostreams-mt
BOOST_REGEX = boost_regex \ BOOST_REGEX = boost_regex \
boost_regex-mt boost_regex-mt
BOOST_SYS = boost_system \
boost_system-mt
# searching in $PREFIX/lib and $PREFIX/lib64 # searching in $PREFIX/lib and $PREFIX/lib64
# to override the default '/usr' pass PREFIX # to override the default '/usr' pass PREFIX
@@ -394,12 +396,17 @@ unix:!mac {
message("Found $$lib") message("Found $$lib")
BOOST_REGEX = -l$$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_LIBS = $$BOOST_THREAD \
$$BOOST_FS \ $$BOOST_FS \
$$BOOST_IOSTREAMS \ $$BOOST_IOSTREAMS \
$$BOOST_REGEX $$BOOST_REGEX \
!count(BOOST_LIBS, 4):error("Unable to find boost libraries in PREFIX=$${PREFIX}") $$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!") if($$system(sdl-config --version)):error("sdl-config not found in PATH - libSDL_mixer, libSDL are required!")
UNAME = $$system(uname -s) UNAME = $$system(uname -s)
BSD = $$find(UNAME, "BSD") BSD = $$find(UNAME, "BSD")
pokerth_server.pro
+10 -2
View File
@@ -187,8 +187,10 @@ unix : !mac {
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_IOSTREAMS = boost_iostreams boost_iostreams-mt BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt
BOOST_SYS = boost_system boost_system-mt
BOOST_REGEX = boost_regex boost_regex-mt BOOST_REGEX = boost_regex boost_regex-mt
# #
# searching in $PREFIX/lib and $PREFIX/lib64 # searching in $PREFIX/lib and $PREFIX/lib64
# to override the default '/usr' pass PREFIX # to override the default '/usr' pass PREFIX
@@ -226,10 +228,16 @@ unix : !mac {
BOOST_REGEX = -l$$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_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_SYS
!count(BOOST_LIBS, 5){ !count(BOOST_LIBS, 6){
error("Unable to find boost libraries in PREFIX=$${PREFIX}") error("Unable to find boost libraries in PREFIX=$${PREFIX}")
} }