diff --git a/connectivity.pro b/connectivity.pro index 5f4de829..a6704719 100644 --- a/connectivity.pro +++ b/connectivity.pro @@ -41,13 +41,13 @@ unix : !mac { QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib INCLUDEPATH += $${PREFIX}/include - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt BOOST_SYS = boost_system boost_system-mt # - # searching in $PREFIX/lib and $PREFIX/lib64 + # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) # to override the default '/usr' pass PREFIX # variable to qmake. # diff --git a/load.pro b/load.pro index c2deb473..8e3d80f1 100644 --- a/load.pro +++ b/load.pro @@ -42,14 +42,14 @@ unix : !mac { QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib INCLUDEPATH += $${PREFIX}/include - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) BOOST_THREAD = boost_thread boost_thread-mt BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt BOOST_SYS = boost_system boost_system-mt # - # searching in $PREFIX/lib and $PREFIX/lib64 + # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) # to override the default '/usr' pass PREFIX # variable to qmake. # diff --git a/pokerth_game.pro b/pokerth_game.pro index 294dce32..d660452e 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -407,7 +407,8 @@ unix:!mac { !android{ LIBPATH += $${PREFIX}/lib /opt/gsasl/lib LIB_DIRS = $${PREFIX}/lib \ - $${PREFIX}/lib64 + $${PREFIX}/lib64 \ + $$system(qmake -query QT_INSTALL_LIBS) } android{ LIBPATH += $${PREFIX}/lib/armv7 @@ -426,7 +427,7 @@ unix:!mac { BOOST_RANDOM = boost_random \ boost_random-mt - # searching in $PREFIX/lib and $PREFIX/lib64 + # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) # to override the default '/usr' pass PREFIX # variable to qmake. for(dir, LIB_DIRS):exists($$dir) { diff --git a/pokerth_server.pro b/pokerth_server.pro index d27a0e77..706475f7 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -175,7 +175,7 @@ unix : !mac { LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib INCLUDEPATH += $${PREFIX}/include - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) BOOST_FS = boost_filesystem boost_filesystem-mt BOOST_THREAD = boost_thread boost_thread-mt BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt @@ -185,7 +185,7 @@ unix : !mac { BOOST_RANDOM = boost_random boost_random-mt # - # searching in $PREFIX/lib and $PREFIX/lib64 + # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) # to override the default '/usr' pass PREFIX # variable to qmake. # diff --git a/zlib_compress.pro b/zlib_compress.pro index d141ac06..7863d6fb 100644 --- a/zlib_compress.pro +++ b/zlib_compress.pro @@ -48,7 +48,7 @@ unix : !mac { #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections #QMAKE_LFLAGS += -Wl,--gc-sections - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) BOOST_FS = boost_filesystem boost_filesystem-mt BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt BOOST_SYSTEM = boost_system boost_system-mt