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/qws | |
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/qws/freebsd-generic-g++/qmake.conf | 7 | ||||
-rw-r--r-- | mkspecs/qws/freebsd-generic-g++/qplatformdefs.h | 103 | ||||
-rw-r--r-- | mkspecs/qws/linux-arm-g++/qmake.conf | 11 | ||||
-rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 8 | ||||
-rw-r--r-- | mkspecs/qws/linux-ipaq-g++/qmake.conf | 13 | ||||
-rw-r--r-- | mkspecs/qws/linux-mips-g++/qmake.conf | 7 | ||||
-rw-r--r-- | mkspecs/qws/linux-ramses-g++/qmake.conf | 3 | ||||
-rw-r--r-- | mkspecs/qws/linux-sharp-g++/qmake.conf | 13 | ||||
-rw-r--r-- | mkspecs/qws/linux-simpad-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/linux-x86-g++/qmake.conf | 7 | ||||
-rwxr-xr-x | mkspecs/qws/linux-yopy-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/macx-generic-g++/qmake.conf | 14 | ||||
-rw-r--r-- | mkspecs/qws/qnx4-cc/qmake.conf | 9 | ||||
-rw-r--r-- | mkspecs/qws/qnx6-generic-cc/qmake.conf | 10 | ||||
-rw-r--r-- | mkspecs/qws/qnx6-generic-g++/qmake.conf | 10 | ||||
-rw-r--r-- | mkspecs/qws/solaris-generic-g++/qmake.conf | 9 | ||||
-rw-r--r-- | mkspecs/qws/solaris-generic-g++/qplatformdefs.h | 12 |
17 files changed, 206 insertions, 34 deletions
diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf index 82b22d7..0a9ea90 100644 --- a/mkspecs/qws/freebsd-generic-g++/qmake.conf +++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -41,2 +41,4 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
42 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
43 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
42 | 44 | ||
@@ -57,2 +59,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
57 | QMAKE_LIBS_THREAD = | 59 | QMAKE_LIBS_THREAD = |
60 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
58 | 61 | ||
@@ -71 +74,3 @@ QMAKE_DEL_FILE = rm -f | |||
71 | QMAKE_DEL_DIR = rmdir | 74 | QMAKE_DEL_DIR = rmdir |
75 | QMAKE_CHK_DIR_EXISTS= test -d | ||
76 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h new file mode 100644 index 0000000..a164a73 --- a/dev/null +++ b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h | |||
@@ -0,0 +1,103 @@ | |||
1 | #ifndef QPLATFORMDEFS_H | ||
2 | #define QPLATFORMDEFS_H | ||
3 | |||
4 | // Get Qt defines/settings | ||
5 | |||
6 | #include "qglobal.h" | ||
7 | |||
8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | ||
9 | |||
10 | #include <unistd.h> | ||
11 | |||
12 | |||
13 | // We are hot - unistd.h should have turned on the specific APIs we requested | ||
14 | |||
15 | |||
16 | #ifdef QT_THREAD_SUPPORT | ||
17 | #include <pthread.h> | ||
18 | #endif | ||
19 | |||
20 | #include <dirent.h> | ||
21 | #include <fcntl.h> | ||
22 | #include <grp.h> | ||
23 | #include <pwd.h> | ||
24 | #include <signal.h> | ||
25 | #include <dlfcn.h> | ||
26 | |||
27 | #include <sys/types.h> | ||
28 | #include <sys/ioctl.h> | ||
29 | #include <sys/ipc.h> | ||
30 | #include <sys/time.h> | ||
31 | #include <sys/shm.h> | ||
32 | #include <sys/socket.h> | ||
33 | #include <sys/stat.h> | ||
34 | #include <sys/wait.h> | ||
35 | |||
36 | // DNS header files are not fully covered by X/Open specifications. | ||
37 | // In particular nothing is said about res_* :/ | ||
38 | // On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not | ||
39 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | ||
40 | // before <resolv.h>. | ||
41 | #include <netinet/in.h> | ||
42 | #define class c_class // FreeeBSD 3.x | ||
43 | #include <arpa/nameser.h> | ||
44 | #undef class | ||
45 | #include <resolv.h> | ||
46 | |||
47 | |||
48 | #if !defined(QT_NO_COMPAT) | ||
49 | #define QT_STATBUF struct stat | ||
50 | #define QT_STATBUF4TSTATstruct stat | ||
51 | #define QT_STAT ::stat | ||
52 | #define QT_FSTAT ::fstat | ||
53 | #define QT_STAT_REG S_IFREG | ||
54 | #define QT_STAT_DIR S_IFDIR | ||
55 | #define QT_STAT_MASK S_IFMT | ||
56 | #define QT_STAT_LNK S_IFLNK | ||
57 | #define QT_FILENO fileno | ||
58 | #define QT_OPEN ::open | ||
59 | #define QT_CLOSE ::close | ||
60 | #define QT_LSEEK ::lseek | ||
61 | #define QT_READ ::read | ||
62 | #define QT_WRITE ::write | ||
63 | #define QT_ACCESS ::access | ||
64 | #define QT_GETCWD ::getcwd | ||
65 | #define QT_CHDIR ::chdir | ||
66 | #define QT_MKDIR ::mkdir | ||
67 | #define QT_RMDIR ::rmdir | ||
68 | #define QT_OPEN_RDONLY O_RDONLY | ||
69 | #define QT_OPEN_WRONLY O_WRONLY | ||
70 | #define QT_OPEN_RDWR O_RDWR | ||
71 | #define QT_OPEN_CREAT O_CREAT | ||
72 | #define QT_OPEN_TRUNC O_TRUNC | ||
73 | #define QT_OPEN_APPEND O_APPEND | ||
74 | #endif | ||
75 | |||
76 | #define QT_SIGNAL_RETTYPEvoid | ||
77 | #define QT_SIGNAL_ARGS int | ||
78 | #define QT_SIGNAL_IGNORESIG_IGN | ||
79 | |||
80 | #if __FreeBSD_version < 400000 | ||
81 | // FreeBSD 1.0 - 3.5.1 | ||
82 | # define QT_SOCKLEN_T int | ||
83 | #else | ||
84 | // FreeBSD 4.0 - 5.0 | ||
85 | # define QT_SOCKLEN_T socklen_t | ||
86 | #endif | ||
87 | |||
88 | #define QT_SNPRINTF ::snprintf | ||
89 | #define QT_VSNPRINTF ::vsnprintf | ||
90 | |||
91 | // Older FreeBSD versions may still use the a.out format instead of ELF. | ||
92 | // From the FreeBSD man pages: | ||
93 | // In previous implementations, it was necessary to prepend an | ||
94 | // underscore to all external symbols in order to gain symbol | ||
95 | // compatibility with object code compiled from the C language. | ||
96 | // This is still the case when using the (obsolete) -aout option to | ||
97 | // the C language compiler. | ||
98 | #ifndef __ELF__ | ||
99 | #define QT_AOUT_UNDERSCORE | ||
100 | #endif | ||
101 | |||
102 | |||
103 | #endif // QPLATFORMDEFS_H | ||
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf index a5c08ae..244f9a8 100644 --- a/mkspecs/qws/linux-arm-g++/qmake.conf +++ b/mkspecs/qws/linux-arm-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -42,5 +42,7 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
43 | 45 | ||
44 | QMAKE_LINK = arm-linux-gcc | 46 | QMAKE_LINK = arm-linux-g++ |
45 | QMAKE_LINK_SHLIB= arm-linux-gcc | 47 | QMAKE_LINK_SHLIB= arm-linux-g++ |
46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
@@ -61,2 +63,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
@@ -76 +79,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index 2610b12..4e837d6 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -42,2 +42,4 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include/ | ||
44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
43 | 45 | ||
@@ -61,2 +63,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
@@ -76 +79,4 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
80 | QMAKE_STRIP = strip | ||
81 | QMAKE_CHK_DIR_EXISTS= test -d | ||
82 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf index be91a64..b42f2d6 100644 --- a/mkspecs/qws/linux-ipaq-g++/qmake.conf +++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -42,5 +42,7 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
43 | 45 | ||
44 | QMAKE_LINK = arm-linux-gcc | 46 | QMAKE_LINK = arm-linux-g++ |
45 | QMAKE_LINK_SHLIB= arm-linux-gcc | 47 | QMAKE_LINK_SHLIB= arm-linux-g++ |
46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
@@ -52,3 +54,3 @@ QMAKE_LFLAGS_SONAME = -Wl,-soname, | |||
52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
53 | QMAKE_RPATH = -Wl,-rpath-link, | 55 | QMAKE_RPATH = -Wl,-rpath, |
54 | 56 | ||
@@ -61,2 +63,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
@@ -76 +79,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-mips-g++/qmake.conf b/mkspecs/qws/linux-mips-g++/qmake.conf index f5d2033..f9a410a 100644 --- a/mkspecs/qws/linux-mips-g++/qmake.conf +++ b/mkspecs/qws/linux-mips-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -42,2 +42,4 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
43 | 45 | ||
@@ -61,2 +63,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
@@ -76 +79,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-ramses-g++/qmake.conf b/mkspecs/qws/linux-ramses-g++/qmake.conf index 612c7a4..028c157 100644 --- a/mkspecs/qws/linux-ramses-g++/qmake.conf +++ b/mkspecs/qws/linux-ramses-g++/qmake.conf | |||
@@ -83 +83,4 @@ QMAKE_DEL_FILE = rm -f | |||
83 | QMAKE_DEL_DIR = rmdir | 83 | QMAKE_DEL_DIR = rmdir |
84 | QMAKE_STRIP = strip | ||
85 | QMAKE_CHK_DIR_EXISTS= test -d | ||
86 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf index e90ea59..27b2e91 100644 --- a/mkspecs/qws/linux-sharp-g++/qmake.conf +++ b/mkspecs/qws/linux-sharp-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -24,3 +24,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT | |||
24 | 24 | ||
25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_SL5XXX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM | 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP |
26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
@@ -42,5 +42,7 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
43 | 45 | ||
44 | QMAKE_LINK = arm-linux-gcc | 46 | QMAKE_LINK = arm-linux-g++ |
45 | QMAKE_LINK_SHLIB= arm-linux-gcc | 47 | QMAKE_LINK_SHLIB= arm-linux-g++ |
46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
@@ -61,2 +63,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
@@ -76 +79,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-simpad-g++/qmake.conf b/mkspecs/qws/linux-simpad-g++/qmake.conf index 7dce65d..9094ea9 100644 --- a/mkspecs/qws/linux-simpad-g++/qmake.conf +++ b/mkspecs/qws/linux-simpad-g++/qmake.conf | |||
@@ -76 +76,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 76 | QMAKE_DEL_DIR = rmdir |
77 | QMAKE_CHK_DIR_EXISTS= test -d | ||
78 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-x86-g++/qmake.conf b/mkspecs/qws/linux-x86-g++/qmake.conf index fc5723a..7c31e2c 100644 --- a/mkspecs/qws/linux-x86-g++/qmake.conf +++ b/mkspecs/qws/linux-x86-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -42,2 +42,4 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
43 | 45 | ||
@@ -61,2 +63,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
@@ -76 +79,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-yopy-g++/qmake.conf b/mkspecs/qws/linux-yopy-g++/qmake.conf index 6d97110..3c8c148 100755 --- a/mkspecs/qws/linux-yopy-g++/qmake.conf +++ b/mkspecs/qws/linux-yopy-g++/qmake.conf | |||
@@ -76 +76,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 76 | QMAKE_DEL_DIR = rmdir |
77 | QMAKE_CHK_DIR_EXISTS = test -d | ||
78 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index 7bc67c7..99acca7 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | QMAKE_EXTENSION_SHLIB= dylib | 10 | QMAKE_EXTENSION_SHLIB= dylib |
@@ -26,3 +26,4 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT | |||
26 | QMAKE_CXX = $(TB)c++ | 26 | QMAKE_CXX = $(TB)c++ |
27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DQ_OS_MACX -DQT_NO_SOUND -DOPIE_NO_OVERRIDE_QT -DOPIE_NO_BACKTRACE | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
28 | DEFINES += QWS | ||
28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
@@ -43,2 +44,4 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
43 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
45 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
46 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
44 | 47 | ||
@@ -60,5 +63,5 @@ QMAKE_LIBS_X11SM = | |||
60 | QMAKE_LIBS_QT = -lqte | 63 | QMAKE_LIBS_QT = -lqte |
61 | #QMAKE_LIBS_QT = libqte.dylib | ||
62 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 64 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
63 | QMAKE_LIBS_QT_OPENGL= -lqgl | 65 | QMAKE_LIBS_QT_OPENGL= -lqgl |
66 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
64 | QMAKE_LIBS_THREAD= | 67 | QMAKE_LIBS_THREAD= |
@@ -78,4 +81,3 @@ QMAKE_DEL_FILE = rm -f | |||
78 | QMAKE_DEL_DIR = rmdir | 81 | QMAKE_DEL_DIR = rmdir |
79 | 82 | QMAKE_CHK_DIR_EXISTS= test -d | |
80 | 83 | QMAKE_MKDIR = mkdir -p | |
81 | |||
diff --git a/mkspecs/qws/qnx4-cc/qmake.conf b/mkspecs/qws/qnx4-cc/qmake.conf index 1ca2029..fac6a5b 100644 --- a/mkspecs/qws/qnx4-cc/qmake.conf +++ b/mkspecs/qws/qnx4-cc/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release no_mocdepend | 9 | CONFIG += qt no_mocdepend link_prl |
10 | 10 | ||
@@ -39,2 +39,4 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
39 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 39 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
40 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
41 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
40 | 42 | ||
@@ -51,3 +53,3 @@ QMAKE_RPATH = | |||
51 | 53 | ||
52 | QMAKE_LIBS = $(LIBS_EXTRA) | 54 | QMAKE_LIBS = -lsocket $(LIBS_EXTRA) |
53 | QMAKE_LIBS_DYNLOAD= | 55 | QMAKE_LIBS_DYNLOAD= |
@@ -55,2 +57,3 @@ QMAKE_LIBS_QT = -T 1 -lqte | |||
55 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 57 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
58 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
56 | QMAKE_LIBS_THREAD= | 59 | QMAKE_LIBS_THREAD= |
@@ -70 +73,3 @@ QMAKE_DEL_FILE = rm -f | |||
70 | QMAKE_DEL_DIR = rmdir | 73 | QMAKE_DEL_DIR = rmdir |
74 | QMAKE_CHK_DIR_EXISTS= test -d | ||
75 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf index 51eb3fe..55535fd 100644 --- a/mkspecs/qws/qnx6-generic-cc/qmake.conf +++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -42,2 +42,4 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
43 | 45 | ||
@@ -54,3 +56,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 56 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = -lsocket -lcpp $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
@@ -61,2 +63,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
62 | QMAKE_LIBS_THREAD= -lpthread | 65 | QMAKE_LIBS_THREAD= -lpthread |
@@ -76,2 +79,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
77 | 80 | QMAKE_CHK_DIR_EXISTS= test -d | |
81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/qnx6-generic-g++/qmake.conf b/mkspecs/qws/qnx6-generic-g++/qmake.conf index 3519a59..93f0dfc 100644 --- a/mkspecs/qws/qnx6-generic-g++/qmake.conf +++ b/mkspecs/qws/qnx6-generic-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -42,2 +42,4 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
43 | 45 | ||
@@ -54,3 +56,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 56 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = -lsocket $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
@@ -61,2 +63,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
62 | QMAKE_LIBS_THREAD= -lpthread | 65 | QMAKE_LIBS_THREAD= -lpthread |
@@ -76,2 +79,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
77 | 80 | QMAKE_CHK_DIR_EXISTS= test -d | |
81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf index 057e343..a521389 100644 --- a/mkspecs/qws/solaris-generic-g++/qmake.conf +++ b/mkspecs/qws/solaris-generic-g++/qmake.conf | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
@@ -42,2 +42,4 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include | |||
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
43 | 45 | ||
@@ -54,3 +56,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 56 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = -lsocket -lnsl -lresolv $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
@@ -61,2 +63,3 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt | |||
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
62 | QMAKE_LIBS_THREAD= -lthread -lrt | 65 | QMAKE_LIBS_THREAD= -lthread -lrt |
@@ -76 +79,3 @@ QMAKE_DEL_FILE = rm -f | |||
76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h index a4ca615..02ab5b4 100644 --- a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h +++ b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h | |||
@@ -8,2 +8,5 @@ | |||
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 | #ifndef _POSIX_PTHREAD_SEMANTICS | ||
10 | #define _POSIX_PTHREAD_SEMANTICS | ||
11 | #endif | ||
9 | 12 | ||
@@ -79,5 +82,7 @@ | |||
79 | #if !defined(_XOPEN_UNIX) | 82 | #if !defined(_XOPEN_UNIX) |
80 | // Function usleep() is in C library but not in header files on Solaris 2.5.1. | 83 | // 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 | 84 | // on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2 |
82 | // supported by Solaris 2.6 and better. | 85 | // and XPG4v2 is only supported by Solaris 2.6 and better. |
86 | // Function gethostname() is defined in C library but not declared in <unistd.h> | ||
87 | // on Solaris 2.5.1. | ||
83 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is | 88 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is |
@@ -86,2 +91,3 @@ typedef unsigned int useconds_t; | |||
86 | extern "C" int usleep(useconds_t); | 91 | extern "C" int usleep(useconds_t); |
92 | extern "C" int gethostname(char *, int); | ||
87 | #endif | 93 | #endif |