-rw-r--r-- | mkspecs/solaris-cc/qmake.conf | 13 | ||||
-rw-r--r-- | mkspecs/solaris-cc/qplatformdefs.h | 10 |
2 files changed, 15 insertions, 8 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,22 +1,23 @@ # # $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 = +QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -xM QMAKE_CFLAGS_WARN_ON = QMAKE_CFLAGS_WARN_OFF = -w QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) QMAKE_CFLAGS_DEBUG = -g @@ -59,25 +60,27 @@ QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl QMAKE_LIBS_X11SM = -lSM -lICE 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 QMAKE_AR = CC -xar -o QMAKE_RANLIB = QMAKE_CLEAN = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache QMAKE_TAR = tar -cf 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 @@ -1,16 +1,17 @@ #ifndef QPLATFORMDEFS_H #define QPLATFORMDEFS_H // Get Qt defines/settings #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> // We are hot - unistd.h should have turned on the specific APIs we requested #ifdef QT_THREAD_SUPPORT @@ -72,23 +73,26 @@ #define QT_OPEN_APPEND O_APPEND #endif #define QT_SIGNAL_RETTYPE void #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 #define QT_SOCKLEN_T socklen_t #elif defined(_XOPEN_SOURCE_EXTENDED) && (_XOPEN_VERSION-0 >= 4) // on Solaris 2.6 and better with specific feature test macros #define QT_SOCKLEN_T size_t |