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

linux fixes for new boost::regex

Browse Source
This commit is contained in:
doitux
2009-04-09 16:38:44 +00:00
parent e860dbc1e9
commit de78d04b87
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+9 -3
View File
@@ -341,7 +341,7 @@ unix : !mac {
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_IOSTREAMS = boost_iostreams boost_iostreams-mt BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt
BOOST_REGEX = boost_regex boost_regex-mt
# #
# searching in $PREFIX/lib and $PREFIX/lib64 # searching in $PREFIX/lib and $PREFIX/lib64
@@ -368,10 +368,16 @@ unix : !mac {
BOOST_IOSTREAMS = -l$$lib BOOST_IOSTREAMS = -l$$lib
} }
} }
for(lib, BOOST_REGEX){
exists($${dir}/lib$${lib}.so*){
message("Found $$lib")
BOOST_REGEX = -l$$lib
}
}
} }
} }
BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_IOSTREAMS BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_IOSTREAMS $$BOOST_REGEX
!count(BOOST_LIBS, 3){ !count(BOOST_LIBS, 4){
error("Unable to find boost libraries in PREFIX=$${PREFIX}") error("Unable to find boost libraries in PREFIX=$${PREFIX}")
} }
pokerth_server.pro
+9 -2
View File
@@ -173,6 +173,7 @@ 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_REGEX = boost_regex boost_regex-mt
# #
# searching in $PREFIX/lib and $PREFIX/lib64 # searching in $PREFIX/lib and $PREFIX/lib64
@@ -205,10 +206,16 @@ unix : !mac {
BOOST_IOSTREAMS = -l$$lib BOOST_IOSTREAMS = -l$$lib
} }
} }
for(lib, BOOST_REGEX){
exists($${dir}/lib$${lib}.so*){
message("Found $$lib")
BOOST_REGEX = -l$$lib
}
}
} }
} }
BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX
!count(BOOST_LIBS, 4){ !count(BOOST_LIBS, 5){
error("Unable to find boost libraries in PREFIX=$${PREFIX}") error("Unable to find boost libraries in PREFIX=$${PREFIX}")
} }