-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 @@ -3,4 +3,5 @@ # -# 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. # @@ -9,3 +10,3 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release link_prl @@ -66,3 +67,3 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_LIBS_THREAD = -lpthread +QMAKE_LIBS_THREAD = -lpthread -lrt @@ -83 +84,3 @@ 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 @@ -8,2 +8,3 @@ // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs +#define _POSIX_PTHREAD_SEMANTICS @@ -79,5 +80,7 @@ #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 @@ -86,2 +89,3 @@ typedef unsigned int useconds_t; extern "C" int usleep(useconds_t); +extern "C" int gethostname(char *, int); #endif |