whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <oswald.buddenhagen@qt.io>
bb10
Julien Gueytat 2017-02-03 01:44:20 +01:00 committed by Oswald Buddenhagen
parent ba43ecade3
commit 9d6d9984f5
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/common/solaris.conf
View File

@ -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

5
mkspecs/solaris-g++-64/qmake.conf
View File

@ -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)

5
mkspecs/solaris-g++/qmake.conf
View File

@ -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)