From: Markus Koschany Date: Tue, 23 Aug 2016 17:50:52 +0200 Subject: qmake gcc-6 --- chatcleaner.pro | 1 - pokerth_db.pro | 1 - pokerth_game.pro | 1 - pokerth_lib.pro | 2 +- pokerth_protocol.pro | 1 - pokerth_server.pro | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/chatcleaner.pro b/chatcleaner.pro index 6d63b4a..56070d8 100644 --- a/chatcleaner.pro +++ b/chatcleaner.pro @@ -49,7 +49,6 @@ win32 { !win32{ ##### My release static build options #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections - INCLUDEPATH += $${PREFIX}/include } mac { # make it x86_64 only diff --git a/pokerth_db.pro b/pokerth_db.pro index 7c2d142..c524ee3 100644 --- a/pokerth_db.pro +++ b/pokerth_db.pro @@ -49,7 +49,6 @@ win32{ !win32{ ##### My release static build options #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections - INCLUDEPATH += $${PREFIX}/include } mac{ diff --git a/pokerth_game.pro b/pokerth_game.pro index e3ddb03..e0e8660 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -404,7 +404,6 @@ unix:!mac { # #### My release static build options # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections # QMAKE_LFLAGS += -Wl,--gc-sections - INCLUDEPATH += $${PREFIX}/include QMAKE_LIBDIR += lib !android{ LIBPATH += $${PREFIX}/lib /opt/gsasl/lib diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 6db489d..498d06e 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -243,7 +243,7 @@ win32{ !win32{ ##### My release static build options #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections - INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include + INCLUDEPATH += /opt/gsasl/include } mac{ diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro index 7a331df..2ead0ec 100644 --- a/pokerth_protocol.pro +++ b/pokerth_protocol.pro @@ -33,7 +33,6 @@ win32 { DEFINES += _WIN32_WINNT=0x0501 } unix : !mac { - INCLUDEPATH += $${PREFIX}/include system(protoc pokerth.proto --cpp_out=src/third_party/protobuf) system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf) system(protoc pokerth.proto --java_out=tests/src) diff --git a/pokerth_server.pro b/pokerth_server.pro index 706475f..43b30f3 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -174,7 +174,6 @@ unix : !mac { #QMAKE_LFLAGS += -Wl,--gc-sections LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib - INCLUDEPATH += $${PREFIX}/include 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