| author | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
| commit | 8795812a0d763742a5273f356c35313af0fed84d (patch) (side-by-side diff) | |
| tree | 34b7259e1595e53e1fa2069d7d79bbdef67293e8 /mkspecs/solaris-cc | |
| parent | 8e8fcd65b8d8657650728bae604c5a34dc31338e (diff) | |
| download | opie-8795812a0d763742a5273f356c35313af0fed84d.zip opie-8795812a0d763742a5273f356c35313af0fed84d.tar.gz opie-8795812a0d763742a5273f356c35313af0fed84d.tar.bz2 | |
-CHECK if DIR exist added to qmake.conf's
-use arm-linux-g++ for linking now
hopefully not removed anything important
Added python tool to opiefy mkspecs
| -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 @@ -2,15 +2,16 @@ # $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 @@ -65,5 +66,5 @@ 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 @@ -82,2 +83,4 @@ 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 @@ -7,4 +7,5 @@ // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs +#define _POSIX_PTHREAD_SEMANTICS #include <unistd.h> @@ -78,11 +79,14 @@ #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 |