author | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
commit | 8795812a0d763742a5273f356c35313af0fed84d (patch) (unidiff) | |
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 @@ | |||
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for Sun WorkShop 5.0, Forte Developer 6, | 4 | # qmake configuration for solaris-cc |
5 | # and Sun ONE Studio 7 on Solaris | 5 | # |
6 | # Written for Sun WorkShop 5.0, Forte Developer 6, and Sun ONE Studio 7. | ||
6 | # | 7 | # |
7 | 8 | ||
8 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
9 | TEMPLATE = app | 10 | TEMPLATE = app |
10 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
11 | 12 | ||
12 | QMAKE_CC = cc | 13 | QMAKE_CC = cc |
13 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
14 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
15 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
16 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
@@ -65,5 +66,5 @@ QMAKE_LIBS_QT_THREAD = -lqt-mt | |||
65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
67 | QMAKE_LIBS_THREAD= -lpthread | 68 | QMAKE_LIBS_THREAD= -lpthread -lrt |
68 | 69 | ||
69 | QMAKE_MOC = $(QTDIR)/bin/moc | 70 | QMAKE_MOC = $(QTDIR)/bin/moc |
@@ -82,2 +83,4 @@ QMAKE_MOVE = mv -f | |||
82 | QMAKE_DEL_FILE = rm -f | 83 | QMAKE_DEL_FILE = rm -f |
83 | QMAKE_DEL_DIR = rmdir | 84 | QMAKE_DEL_DIR = rmdir |
85 | QMAKE_CHK_DIR_EXISTS= test -d | ||
86 | 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 @@ | |||
7 | 7 | ||
8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs |
9 | #define _POSIX_PTHREAD_SEMANTICS | ||
9 | 10 | ||
10 | #include <unistd.h> | 11 | #include <unistd.h> |
@@ -78,11 +79,14 @@ | |||
78 | 79 | ||
79 | #if !defined(_XOPEN_UNIX) | 80 | #if !defined(_XOPEN_UNIX) |
80 | // Function usleep() is in C library but not in header files on Solaris 2.5.1. | 81 | // Function usleep() is defined in C library but not declared in header files |
81 | // Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only | 82 | // on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2 |
82 | // supported by Solaris 2.6 and better. | 83 | // and XPG4v2 is only supported by Solaris 2.6 and better. |
84 | // Function gethostname() is defined in C library but not declared in <unistd.h> | ||
85 | // on Solaris 2.5.1. | ||
83 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is | 86 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is |
84 | // not defined by <unistd.h> when XPG4v2 is not supported. | 87 | // not defined by <unistd.h> when XPG4v2 is not supported. |
85 | typedef unsigned int useconds_t; | 88 | typedef unsigned int useconds_t; |
86 | extern "C" int usleep(useconds_t); | 89 | extern "C" int usleep(useconds_t); |
90 | extern "C" int gethostname(char *, int); | ||
87 | #endif | 91 | #endif |
88 | 92 | ||