From 9d6d9984f56366f40b4e0c5391a2acb988d2b2c7 Mon Sep 17 00:00:00 2001 From: Julien Gueytat Date: Fri, 3 Feb 2017 01:44:20 +0100 Subject: Update Solaris include path and library path The path match OpenIndiana distribution based on Illumos. Task-number: QTBUG-56293 Change-Id: I44e7defa63809dc4f413b46329481b53e5e74c30 Reviewed-by: Oswald Buddenhagen --- mkspecs/common/solaris.conf | 5 ++--- mkspecs/solaris-g++-64/qmake.conf | 5 ++--- mkspecs/solaris-g++/qmake.conf | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/common/solaris.conf b/mkspecs/common/solaris.conf index d965cb44d0..8581838434 100644 --- a/mkspecs/common/solaris.conf +++ b/mkspecs/common/solaris.conf @@ -9,9 +9,8 @@ include(unix.conf) QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -QMAKE_INCDIR = /usr/sfw/include -QMAKE_INCDIR_X11 = /usr/openwin/include -QMAKE_INCDIR_OPENGL = /usr/openwin/include +QMAKE_INCDIR_X11 = /usr/X11/include +QMAKE_INCDIR_OPENGL = /usr/X11/include/mesa QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index e42dc970de..6fc93d45b7 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf @@ -34,9 +34,8 @@ include(../common/solaris.conf) QMAKE_CFLAGS = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ QMAKE_LFLAGS = -m64 -QMAKE_LIBDIR = /usr/sfw/lib/64 -QMAKE_LIBDIR_X11 = /usr/openwin/lib/64 -QMAKE_LIBDIR_OPENGL = /usr/openwin/lib/64 +QMAKE_LIBDIR_X11 = /usr/X11/lib/64 +QMAKE_LIBDIR_OPENGL = /usr/X11/lib/64 include(../common/gcc-base.conf) diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index 6f7d9e4c05..943b0865c9 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf @@ -14,9 +14,8 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/solaris.conf) -QMAKE_LIBDIR = /usr/sfw/lib -QMAKE_LIBDIR_X11 = /usr/openwin/lib -QMAKE_LIBDIR_OPENGL = /usr/openwin/lib +QMAKE_LIBDIR_X11 = /usr/X11/lib +QMAKE_LIBDIR_OPENGL = /usr/X11/lib include(../common/gcc-base.conf) -- cgit v1.2.3