projects / packages / pokerth.git / blame
| Commit | Line | Data |
|---|---|---|
| b5517f57 JB |
1 | --- pokerth-1.1.2-rc/pokerth_game.pro.orig 2017-08-16 14:24:03.000000000 +0200 |
| 2 | +++ pokerth-1.1.2-rc/pokerth_game.pro 2019-05-06 18:44:47.675780451 +0200 | |
| 3 | @@ -408,11 +408,8 @@ | |
| 4 | INCLUDEPATH += $${PREFIX}/include | |
| 5 | QMAKE_LIBDIR += lib | |
| 6 | !android{ | |
| 7 | - LIBPATH += $${PREFIX}/lib /opt/gsasl/lib | |
| 8 | - LIB_DIRS = $${PREFIX}/lib \ | |
| 9 | - $${PREFIX}/lib64 \ | |
| 10 | - $${PREFIX}/lib/x86_64-linux-gnu \ | |
| 11 | - $$system(qmake -query QT_INSTALL_LIBS) | |
| 12 | + LIBPATH += $$system(qmake-qt4 -query QT_INSTALL_LIBS) | |
| 13 | + LIB_DIRS = $$system(qmake-qt4 -query QT_INSTALL_LIBS) | |
| d89f6892 JR |
14 | } |
| 15 | android{ | |
| b5517f57 | 16 | LIBPATH += $${PREFIX}/lib/armv7 |
| d89f6892 JR |
17 | --- PokerTH-1.1-src/connectivity.pro~ 2013-12-22 17:58:01.000000000 +0100 |
| 18 | +++ PokerTH-1.1-src/connectivity.pro 2015-06-27 10:48:51.073035818 +0200 | |
| 19 | @@ -41,7 +41,7 @@ | |
| 20 | ||
| 21 | QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib | |
| 22 | INCLUDEPATH += $${PREFIX}/include | |
| 23 | - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) | |
| b5517f57 | 24 | + LIB_DIRS = $$system(qmake-qt4 -query QT_INSTALL_LIBS) |
| d89f6892 JR |
25 | BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt |
| 26 | BOOST_SYS = boost_system boost_system-mt | |
| 27 | ||
| 28 | --- PokerTH-1.1-src/load.pro~ 2013-12-22 17:58:01.000000000 +0100 | |
| 29 | +++ PokerTH-1.1-src/load.pro 2015-06-27 10:49:15.413504240 +0200 | |
| 30 | @@ -42,7 +42,7 @@ | |
| 31 | ||
| 32 | QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib | |
| 33 | INCLUDEPATH += $${PREFIX}/include | |
| 34 | - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) | |
| b5517f57 | 35 | + LIB_DIRS = $$system(qmake-qt4 -query QT_INSTALL_LIBS) |
| d89f6892 JR |
36 | BOOST_THREAD = boost_thread boost_thread-mt |
| 37 | BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt | |
| 38 | BOOST_SYS = boost_system boost_system-mt | |
| b5517f57 JB |
39 | --- pokerth-1.1.2-rc/pokerth_server.pro.orig 2019-05-06 18:45:52.762554321 +0200 |
| 40 | +++ pokerth-1.1.2-rc/pokerth_server.pro 2019-05-06 18:47:54.545658538 +0200 | |
| 41 | @@ -180,7 +180,7 @@ | |
| d89f6892 | 42 | INCLUDEPATH += $${PREFIX}/include |
| b5517f57 JB |
43 | # see issue https://github.com/pokerth/pokerth/issues/282 |
| 44 | INCLUDEPATH += $${PREFIX}/include/libircclient | |
| d89f6892 | 45 | - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) |
| b5517f57 | 46 | + LIB_DIRS = $$system(qmake-qt4 -query QT_INSTALL_LIBS) |
| d89f6892 JR |
47 | BOOST_FS = boost_filesystem boost_filesystem-mt |
| 48 | BOOST_THREAD = boost_thread boost_thread-mt | |
| 49 | BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt |