-rw-r--r-- | mkspecs/solaris-cc/qmake.conf | 11 | ||||
-rw-r--r-- | mkspecs/solaris-cc/qplatformdefs.h | 10 |
2 files changed, 14 insertions, 7 deletions
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index bee60c9..d1f080e 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf @@ -1,14 +1,15 @@ # # $Id$ # -# qmake configuration for Sun WorkShop 5.0, Forte Developer 6, -# and Sun ONE Studio 7 on Solaris +# qmake configuration for solaris-cc +# +# Written for Sun WorkShop 5.0, Forte Developer 6, and Sun ONE Studio 7. # MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release link_prl QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = @@ -63,9 +64,9 @@ QMAKE_LIBS_NIS = QMAKE_LIBS_QT = -lqt QMAKE_LIBS_QT_THREAD = -lqt-mt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_LIBS_THREAD = -lpthread +QMAKE_LIBS_THREAD = -lpthread -lrt QMAKE_MOC = $(QTDIR)/bin/moc QMAKE_UIC = $(QTDIR)/bin/uic @@ -80,4 +81,6 @@ QMAKE_GZIP = gzip -9f QMAKE_COPY = cp -f QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h index f9480a9..9506b3c 100644 --- a/mkspecs/solaris-cc/qplatformdefs.h +++ b/mkspecs/solaris-cc/qplatformdefs.h @@ -5,8 +5,9 @@ #include "qglobal.h" // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs +#define _POSIX_PTHREAD_SEMANTICS #include <unistd.h> @@ -76,15 +77,18 @@ #define QT_SIGNAL_ARGS int #define QT_SIGNAL_IGNORE SIG_IGN #if !defined(_XOPEN_UNIX) -// Function usleep() is in C library but not in header files on Solaris 2.5.1. -// Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only -// supported by Solaris 2.6 and better. +// Function usleep() is defined in C library but not declared in header files +// on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2 +// and XPG4v2 is only supported by Solaris 2.6 and better. +// Function gethostname() is defined in C library but not declared in <unistd.h> +// on Solaris 2.5.1. // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is // not defined by <unistd.h> when XPG4v2 is not supported. typedef unsigned int useconds_t; extern "C" int usleep(useconds_t); +extern "C" int gethostname(char *, int); #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500) // on Solaris 7 and better with specific feature test macros |