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 | 9 | ||||
-rw-r--r-- | mkspecs/qws/linux-sharp-g++/qmake.conf | 13 | ||||
-rw-r--r-- | mkspecs/qws/linux-simpad-g++/qmake.conf | 10 | ||||
-rw-r--r-- | mkspecs/qws/linux-x86-g++/qmake.conf | 7 | ||||
-rwxr-xr-x | mkspecs/qws/linux-yopy-g++/qmake.conf | 4 | ||||
-rw-r--r-- | mkspecs/qws/macx-generic-g++/qmake.conf | 14 | ||||
-rw-r--r-- | mkspecs/qws/qnx4-cc/qmake.conf | 15 | ||||
-rw-r--r-- | mkspecs/qws/qnx6-generic-cc/qmake.conf | 12 | ||||
-rw-r--r-- | mkspecs/qws/qnx6-generic-g++/qmake.conf | 12 | ||||
-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, 219 insertions, 47 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 | |||
@@ -1,21 +1,21 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for freebsd-g++ with Qt/Embedded | 4 | # qmake configuration for freebsd-g++ with Qt/Embedded |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) |
21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
@@ -30,42 +30,47 @@ QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON | |||
30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
36 | 36 | ||
37 | # Addon software goes into /usr/local on the BSDs, by default we will look there | 37 | # Addon software goes into /usr/local on the BSDs, by default we will look there |
38 | QMAKE_INCDIR = /usr/local/include | 38 | QMAKE_INCDIR = /usr/local/include |
39 | QMAKE_LIBDIR = /usr/local/lib | 39 | QMAKE_LIBDIR = /usr/local/lib |
40 | QMAKE_INCDIR_QT = $(QTDIR)/include | 40 | 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 | ||
43 | QMAKE_LINK = g++ | 45 | QMAKE_LINK = g++ |
44 | QMAKE_LINK_SHLIB= g++ | 46 | QMAKE_LINK_SHLIB= g++ |
45 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
46 | QMAKE_LFLAGS_RELEASE= | 48 | QMAKE_LFLAGS_RELEASE= |
47 | QMAKE_LFLAGS_DEBUG= | 49 | QMAKE_LFLAGS_DEBUG= |
48 | QMAKE_LFLAGS_SHLIB = -shared | 50 | QMAKE_LFLAGS_SHLIB = -shared |
49 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 51 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
50 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 52 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
51 | QMAKE_LFLAGS_THREAD = -pthread | 53 | QMAKE_LFLAGS_THREAD = -pthread |
52 | QMAKE_RPATH = -Wl,-rpath, | 54 | QMAKE_RPATH = -Wl,-rpath, |
53 | 55 | ||
54 | QMAKE_LIBS = $(LIBS_EXTRA) | 56 | QMAKE_LIBS = $(LIBS_EXTRA) |
55 | QMAKE_LIBS_QT = -lqte | 57 | QMAKE_LIBS_QT = -lqte |
56 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 58 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
57 | QMAKE_LIBS_THREAD = | 59 | QMAKE_LIBS_THREAD = |
60 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
58 | 61 | ||
59 | QMAKE_MOC = $(QTDIR)/bin/moc | 62 | QMAKE_MOC = $(QTDIR)/bin/moc |
60 | QMAKE_UIC = $(QTDIR)/bin/uic | 63 | QMAKE_UIC = $(QTDIR)/bin/uic |
61 | 64 | ||
62 | QMAKE_AR = ar cqs | 65 | QMAKE_AR = ar cqs |
63 | QMAKE_RANLIB = | 66 | QMAKE_RANLIB = |
64 | 67 | ||
65 | QMAKE_TAR = tar -cf | 68 | QMAKE_TAR = tar -cf |
66 | QMAKE_GZIP = gzip -9f | 69 | QMAKE_GZIP = gzip -9f |
67 | 70 | ||
68 | QMAKE_COPY = cp -f | 71 | QMAKE_COPY = cp -f |
69 | QMAKE_MOVE = mv -f | 72 | QMAKE_MOVE = mv -f |
70 | QMAKE_DEL_FILE = rm -f | 73 | 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 | |||
@@ -1,21 +1,21 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
@@ -31,46 +31,51 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | |||
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | 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) |
47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
54 | 56 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | 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 |
63 | 66 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 69 | ||
67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
69 | 72 | ||
70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
72 | 75 | ||
73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 78 | 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 | |||
@@ -1,21 +1,21 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for linux-g++ | 4 | # qmake configuration for linux-g++ |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = $(CCACHE) $(DISTCC) gcc | 11 | QMAKE_CC = $(CCACHE) $(DISTCC) gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
@@ -31,46 +31,52 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | |||
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | 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 = g++ | 46 | QMAKE_LINK = g++ |
45 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
54 | 56 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | 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 |
63 | 66 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 69 | ||
67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
69 | 72 | ||
70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
72 | 75 | ||
73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 78 | 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 | |||
@@ -1,21 +1,21 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
@@ -31,46 +31,51 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | |||
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | 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) |
47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | 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 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | 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 |
63 | 66 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 69 | ||
67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
69 | 72 | ||
70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
72 | 75 | ||
73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 78 | 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 | |||
@@ -1,21 +1,21 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for linux-g++ using the mipsel-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the mipsel-linux-g++ crosscompiler |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = mipsel-linux-gcc | 11 | QMAKE_CC = mipsel-linux-gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
@@ -31,46 +31,51 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | |||
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | 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 = mipsel-linux-g++ | 46 | QMAKE_LINK = mipsel-linux-g++ |
45 | QMAKE_LINK_SHLIB= mipsel-linux-g++ | 47 | QMAKE_LINK_SHLIB= mipsel-linux-g++ |
46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
54 | 56 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | 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 |
63 | 66 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 69 | ||
67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
69 | 72 | ||
70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
72 | 75 | ||
73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 78 | 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 | |||
@@ -11,25 +11,25 @@ CONFIG += qt warn_on release | |||
11 | OZDIR = /usr/src/ramses/oz | 11 | OZDIR = /usr/src/ramses/oz |
12 | QTDIR = $$QTDIR/build/qt-2.3.5 | 12 | QTDIR = $$QTDIR/build/qt-2.3.5 |
13 | STAGING_DIR = $$OZDIR/output/staging | 13 | STAGING_DIR = $$OZDIR/output/staging |
14 | STAGING_BIN = $$STAGING_DIR/build/bin | 14 | STAGING_BIN = $$STAGING_DIR/build/bin |
15 | STAGING_LIB = $$STAGING_DIR/target/lib | 15 | STAGING_LIB = $$STAGING_DIR/target/lib |
16 | STAGING_INC = $$STAGING_DIR/include | 16 | STAGING_INC = $$STAGING_DIR/include |
17 | 17 | ||
18 | QMAKE_CC = ccache arm-linux-gcc | 18 | QMAKE_CC = ccache arm-linux-gcc |
19 | QMAKE_LEX = flex | 19 | QMAKE_LEX = flex |
20 | QMAKE_LEXFLAGS = | 20 | QMAKE_LEXFLAGS = |
21 | QMAKE_YACC = yacc | 21 | QMAKE_YACC = yacc |
22 | QMAKE_YACCFLAGS = -d | 22 | QMAKE_YACCFLAGS = -d |
23 | QMAKE_CFLAGS = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA) | 23 | QMAKE_CFLAGS = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA) |
24 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 24 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
25 | QMAKE_CFLAGS_WARN_OFF= | 25 | QMAKE_CFLAGS_WARN_OFF= |
26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
27 | QMAKE_CFLAGS_DEBUG= -g | 27 | QMAKE_CFLAGS_DEBUG= -g |
28 | QMAKE_CFLAGS_SHLIB= -fPIC | 28 | QMAKE_CFLAGS_SHLIB= -fPIC |
29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
30 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 30 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
31 | 31 | ||
32 | QMAKE_CXX = ccache arm-linux-g++ -DQT_QWS_RAMSES -DQT_QWS_DEVFS -DQT_QWS_CUSTOM | 32 | QMAKE_CXX = ccache arm-linux-g++ -DQT_QWS_RAMSES -DQT_QWS_DEVFS -DQT_QWS_CUSTOM |
33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
34 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 34 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
35 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 35 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
@@ -41,43 +41,46 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD | |||
41 | 41 | ||
42 | QMAKE_INCDIR = | 42 | QMAKE_INCDIR = |
43 | QMAKE_LIBDIR = | 43 | QMAKE_LIBDIR = |
44 | QMAKE_INCDIR_X11= | 44 | QMAKE_INCDIR_X11= |
45 | QMAKE_LIBDIR_X11= | 45 | QMAKE_LIBDIR_X11= |
46 | QMAKE_INCDIR_QT = $(QTDIR)/include | 46 | QMAKE_INCDIR_QT = $(QTDIR)/include |
47 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 47 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
48 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 48 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
49 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 49 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
50 | 50 | ||
51 | QMAKE_LINK = arm-linux-gcc | 51 | QMAKE_LINK = arm-linux-gcc |
52 | QMAKE_LINK_SHLIB= arm-linux-gcc | 52 | QMAKE_LINK_SHLIB= arm-linux-gcc |
53 | QMAKE_LFLAGS = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA) | 53 | QMAKE_LFLAGS = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA) |
54 | QMAKE_LFLAGS_RELEASE= | 54 | QMAKE_LFLAGS_RELEASE= |
55 | QMAKE_LFLAGS_DEBUG= | 55 | QMAKE_LFLAGS_DEBUG= |
56 | QMAKE_LFLAGS_SHLIB = -shared | 56 | QMAKE_LFLAGS_SHLIB = -shared |
57 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 57 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
58 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 58 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
59 | QMAKE_LFLAGS_THREAD = | 59 | QMAKE_LFLAGS_THREAD = |
60 | QMAKE_RPATH = -Wl,-rpath, | 60 | QMAKE_RPATH = -Wl,-rpath, |
61 | 61 | ||
62 | QMAKE_LIBS = $(LIBS_EXTRA) | 62 | QMAKE_LIBS = $(LIBS_EXTRA) |
63 | QMAKE_LIBS_DYNLOAD = -ldl | 63 | QMAKE_LIBS_DYNLOAD = -ldl |
64 | QMAKE_LIBS_X11 = | 64 | QMAKE_LIBS_X11 = |
65 | QMAKE_LIBS_X11SM= | 65 | QMAKE_LIBS_X11SM= |
66 | QMAKE_LIBS_QT = -lqte | 66 | QMAKE_LIBS_QT = -lqte |
67 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 67 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
68 | QMAKE_LIBS_QT_OPENGL= -lqgl | 68 | QMAKE_LIBS_QT_OPENGL= -lqgl |
69 | QMAKE_LIBS_THREAD = -lpthread | 69 | QMAKE_LIBS_THREAD = -lpthread |
70 | 70 | ||
71 | QMAKE_MOC = $(QTDIR)/bin/moc | 71 | QMAKE_MOC = $(QTDIR)/bin/moc |
72 | QMAKE_UIC = $(QTDIR)/bin/uic | 72 | QMAKE_UIC = $(QTDIR)/bin/uic |
73 | 73 | ||
74 | QMAKE_AR = ar cqs | 74 | QMAKE_AR = ar cqs |
75 | QMAKE_RANLIB = | 75 | QMAKE_RANLIB = |
76 | 76 | ||
77 | QMAKE_TAR = tar -cf | 77 | QMAKE_TAR = tar -cf |
78 | QMAKE_GZIP = gzip -9f | 78 | QMAKE_GZIP = gzip -9f |
79 | 79 | ||
80 | QMAKE_COPY = cp -f | 80 | QMAKE_COPY = cp -f |
81 | QMAKE_MOVE = mv -f | 81 | QMAKE_MOVE = mv -f |
82 | QMAKE_DEL_FILE = rm -f | 82 | 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 | |||
@@ -1,76 +1,81 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | 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) |
27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | 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) |
47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
53 | QMAKE_RPATH = -Wl,-rpath-link, | 55 | QMAKE_RPATH = -Wl,-rpath-link, |
54 | 56 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | 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 |
63 | 66 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 69 | ||
67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
69 | 72 | ||
70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
72 | 75 | ||
73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 78 | 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 | |||
@@ -4,73 +4,75 @@ | |||
4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release |
10 | 10 | ||
11 | QMAKE_CC = $(CCACHE) arm-linux-gcc | 11 | QMAKE_CC = $(CCACHE) arm-linux-gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
24 | 24 | ||
25 | QMAKE_CXX = $(CCACHE) arm-linux-g++ | 25 | QMAKE_CXX = $(CCACHE) arm-linux-g++ |
26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
43 | 43 | ||
44 | QMAKE_LINK = arm-linux-gcc | 44 | QMAKE_LINK = arm-linux-gcc |
45 | QMAKE_LINK_SHLIB= arm-linux-gcc | 45 | QMAKE_LINK_SHLIB= arm-linux-gcc |
46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
62 | QMAKE_LIBS_THREAD = -lpthread | 62 | QMAKE_LIBS_THREAD = -lpthread |
63 | 63 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 64 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 65 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 66 | ||
67 | QMAKE_AR = ar cqs | 67 | QMAKE_AR = ar cqs |
68 | QMAKE_RANLIB = | 68 | QMAKE_RANLIB = |
69 | 69 | ||
70 | QMAKE_TAR = tar -cf | 70 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 71 | QMAKE_GZIP = gzip -9f |
72 | 72 | ||
73 | QMAKE_COPY = cp -f | 73 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 74 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 75 | 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 | |||
@@ -1,21 +1,21 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for linux-g++ | 4 | # qmake configuration for linux-g++ |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
@@ -31,46 +31,51 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | |||
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | 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 = g++ | 46 | QMAKE_LINK = g++ |
45 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
54 | 56 | ||
55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | 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 |
63 | 66 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 69 | ||
67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
69 | 72 | ||
70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
72 | 75 | ||
73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 78 | 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 | |||
@@ -4,25 +4,25 @@ | |||
4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release |
10 | 10 | ||
11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
24 | 24 | ||
25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_YOPY -I/opt/arm-linux/include/g++-3 | 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_YOPY -I/opt/arm-linux/include/g++-3 |
26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
@@ -65,12 +65,14 @@ QMAKE_MOC = $(QTDIR)/bin/moc | |||
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 65 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 66 | ||
67 | QMAKE_AR = arm-linux-ar cqs | 67 | QMAKE_AR = arm-linux-ar cqs |
68 | QMAKE_RANLIB = | 68 | QMAKE_RANLIB = |
69 | 69 | ||
70 | QMAKE_TAR = tar -cf | 70 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 71 | QMAKE_GZIP = gzip -9f |
72 | 72 | ||
73 | QMAKE_COPY = cp -f | 73 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 74 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 75 | 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 | |||
@@ -1,81 +1,83 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for macx-g++ with Qt/Embedded | 4 | # qmake configuration for macx-g++ with Qt/Embedded |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | 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 |
11 | 11 | ||
12 | QMAKE_CC = $(TB)cc | 12 | QMAKE_CC = $(TB)cc |
13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
19 | QMAKE_CFLAGS_WARN_OFF= | 19 | QMAKE_CFLAGS_WARN_OFF= |
20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) |
21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
25 | 25 | ||
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 |
29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
34 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
35 | 36 | ||
36 | QMAKE_INCDIR = /sw/include | 37 | QMAKE_INCDIR = /sw/include |
37 | QMAKE_LIBDIR = /sw/lib | 38 | QMAKE_LIBDIR = /sw/lib |
38 | QMAKE_INCDIR_X11= | 39 | QMAKE_INCDIR_X11= |
39 | QMAKE_LIBDIR_X11= | 40 | QMAKE_LIBDIR_X11= |
40 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
42 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 43 | 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 | ||
45 | QMAKE_LINK = $$QMAKE_CXX | 48 | QMAKE_LINK = $$QMAKE_CXX |
46 | QMAKE_LINK_SHLIB= $$QMAKE_CXX | 49 | QMAKE_LINK_SHLIB= $$QMAKE_CXX |
47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
48 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
49 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
50 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 53 | QMAKE_LFLAGS_SHLIB= -dynamiclib |
51 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace | 54 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace |
52 | QMAKE_LFLAGS_PLUGIN= -bundle | 55 | QMAKE_LFLAGS_PLUGIN= -bundle |
53 | QMAKE_LFLAGS_SONAME= | 56 | QMAKE_LFLAGS_SONAME= |
54 | QMAKE_LFLAGS_THREAD= | 57 | QMAKE_LFLAGS_THREAD= |
55 | QMAKE_RPATH = | 58 | QMAKE_RPATH = |
56 | 59 | ||
57 | QMAKE_LIBS = $(LIBS_EXTRA) | 60 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_X11 = | 61 | QMAKE_LIBS_X11 = |
59 | QMAKE_LIBS_X11SM= | 62 | 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= |
65 | 68 | ||
66 | QMAKE_MOC = $(QTDIR)/bin/moc | 69 | QMAKE_MOC = $(QTDIR)/bin/moc |
67 | QMAKE_UIC = $(QTDIR)/bin/uic | 70 | QMAKE_UIC = $(QTDIR)/bin/uic |
68 | 71 | ||
69 | QMAKE_AR = ar cqs | 72 | QMAKE_AR = ar cqs |
70 | QMAKE_RANLIB = | 73 | QMAKE_RANLIB = |
71 | 74 | ||
72 | QMAKE_TAR = tar -cf | 75 | QMAKE_TAR = tar -cf |
73 | QMAKE_GZIP = gzip -9f | 76 | QMAKE_GZIP = gzip -9f |
74 | 77 | ||
75 | QMAKE_COPY = cp -f | 78 | QMAKE_COPY = cp -f |
76 | QMAKE_MOVE = mv -f | 79 | QMAKE_MOVE = mv -f |
77 | QMAKE_DEL_FILE = rm -f | 80 | 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 | |||
@@ -1,70 +1,75 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for qnx4-gcc | 4 | # qmake configuration for qnx4-gcc |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | 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 | ||
11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -WC,-sg $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -WC,-sg $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON = -w1 | 17 | QMAKE_CFLAGS_WARN_ON = -w1 |
18 | QMAKE_CFLAGS_WARN_OFF = -w0 | 18 | QMAKE_CFLAGS_WARN_OFF = -w0 |
19 | QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
20 | QMAKE_CFLAGS_DEBUG= -g2d | 20 | QMAKE_CFLAGS_DEBUG= -g2d |
21 | QMAKE_CFLAGS_SHLIB= | 21 | QMAKE_CFLAGS_SHLIB= |
22 | QMAKE_CFLAGS_YACC= | 22 | QMAKE_CFLAGS_YACC= |
23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT -WC,-bm | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT -WC,-bm |
24 | 24 | ||
25 | QMAKE_CXX = cc | 25 | QMAKE_CXX = cc |
26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS $(CXXFLAGS_EXTRA) |
27 | DEFINES += QT_NO_SOUND QT_CLEAN_NAMESPACE QT_NO_QWS_TRANSFORMED QT_NO_QWS_MOUSE_AUTO QT_NO_QWS_MOUSE_MANUAL QT_NO_QWS_LINUXFB | 27 | DEFINES += QT_NO_SOUND QT_CLEAN_NAMESPACE QT_NO_QWS_TRANSFORMED QT_NO_QWS_MOUSE_AUTO QT_NO_QWS_MOUSE_MANUAL QT_NO_QWS_LINUXFB |
28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
34 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 34 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
35 | 35 | ||
36 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics | 36 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics |
37 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib | 37 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib |
38 | QMAKE_INCDIR_QT = $(QTDIR)/include | 38 | 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 | ||
41 | QMAKE_LINK = cc | 43 | QMAKE_LINK = cc |
42 | QMAKE_LINK_SHLIB= cc | 44 | QMAKE_LINK_SHLIB= cc |
43 | QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA) | 45 | QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA) |
44 | QMAKE_LFLAGS_RELEASE= | 46 | QMAKE_LFLAGS_RELEASE= |
45 | QMAKE_LFLAGS_DEBUG= -g2d | 47 | QMAKE_LFLAGS_DEBUG= -g2d |
46 | QMAKE_LFLAGS_SHLIB= -d | 48 | QMAKE_LFLAGS_SHLIB= -d |
47 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 49 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
48 | QMAKE_LFLAGS_SONAME= | 50 | QMAKE_LFLAGS_SONAME= |
49 | QMAKE_LFLAGS_THREAD= | 51 | QMAKE_LFLAGS_THREAD= |
50 | QMAKE_RPATH = | 52 | QMAKE_RPATH = |
51 | 53 | ||
52 | QMAKE_LIBS = $(LIBS_EXTRA) | 54 | QMAKE_LIBS = -lsocket $(LIBS_EXTRA) |
53 | QMAKE_LIBS_DYNLOAD= | 55 | QMAKE_LIBS_DYNLOAD= |
54 | QMAKE_LIBS_QT = -T 1 -lqte | 56 | 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= |
57 | 60 | ||
58 | QMAKE_MOC = $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH) | 61 | QMAKE_MOC = $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH) |
59 | QMAKE_UIC = $(QTDIR)/bin/uic | 62 | QMAKE_UIC = $(QTDIR)/bin/uic |
60 | 63 | ||
61 | QMAKE_AR = wlib -n -c | 64 | QMAKE_AR = wlib -n -c |
62 | QMAKE_RANLIB = | 65 | QMAKE_RANLIB = |
63 | 66 | ||
64 | QMAKE_TAR = tar -cf | 67 | QMAKE_TAR = tar -cf |
65 | QMAKE_GZIP = gzip -9f | 68 | QMAKE_GZIP = gzip -9f |
66 | 69 | ||
67 | QMAKE_COPY = cp -f | 70 | QMAKE_COPY = cp -f |
68 | QMAKE_MOVE = mv -f | 71 | QMAKE_MOVE = mv -f |
69 | QMAKE_DEL_FILE = rm -f | 72 | 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 | |||
@@ -1,21 +1,21 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for qnx-rtp-gcc | 4 | # qmake configuration for qnx-rtp-gcc |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall | 17 | QMAKE_CFLAGS_WARN_ON= -Wall |
18 | QMAKE_CFLAGS_WARN_OFF= -w | 18 | QMAKE_CFLAGS_WARN_OFF= -w |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= | 21 | QMAKE_CFLAGS_SHLIB= |
@@ -31,47 +31,51 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | |||
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics | 35 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics |
36 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib | 36 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib |
37 | QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/ | 37 | QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/ |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | 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 = cc | 46 | QMAKE_LINK = cc |
45 | QMAKE_LINK_SHLIB= cc | 47 | QMAKE_LINK_SHLIB= cc |
46 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) |
47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
52 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
53 | QMAKE_RPATH = -Wl,-rpath, | 55 | 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= |
57 | QMAKE_LIBS_X11 = -ldisputil -lm | 59 | QMAKE_LIBS_X11 = -ldisputil -lm |
58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 62 | 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 |
63 | 66 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 69 | ||
67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
69 | 72 | ||
70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
72 | 75 | ||
73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 78 | 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 | |||
@@ -1,21 +1,21 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for qnx-rtp-gcc | 4 | # qmake configuration for qnx-rtp-gcc |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct -fhonor-std -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct -fhonor-std -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall | 17 | QMAKE_CFLAGS_WARN_ON= -Wall |
18 | QMAKE_CFLAGS_WARN_OFF= -w | 18 | QMAKE_CFLAGS_WARN_OFF= -w |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
@@ -31,47 +31,51 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | |||
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics | 35 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics |
36 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib | 36 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib |
37 | QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/ | 37 | QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/ |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | 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 = cc -fhonor-std | 46 | QMAKE_LINK = cc -fhonor-std |
45 | QMAKE_LINK_SHLIB= cc -fhonor-std | 47 | QMAKE_LINK_SHLIB= cc -fhonor-std |
46 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) |
47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
52 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
53 | QMAKE_RPATH = -Wl,-rpath, | 55 | 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= |
57 | QMAKE_LIBS_X11 = -ldisputil -lm | 59 | QMAKE_LIBS_X11 = -ldisputil -lm |
58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 62 | 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 |
63 | 66 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 69 | ||
67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
69 | 72 | ||
70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
72 | 75 | ||
73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 78 | 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 | |||
@@ -1,21 +1,21 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for solaris-g++ with Qt/Embedded | 4 | # qmake configuration for solaris-g++ with Qt/Embedded |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
10 | 10 | ||
11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) |
20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
@@ -31,46 +31,51 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | |||
31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
34 | 34 | ||
35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | 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 = g++ | 46 | QMAKE_LINK = g++ |
45 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
49 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
52 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
53 | QMAKE_RPATH = -Wl,-rpath, | 55 | 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 |
57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 62 | 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 |
63 | 66 | ||
64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
66 | 69 | ||
67 | QMAKE_AR = ar cq | 70 | QMAKE_AR = ar cq |
68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
69 | 72 | ||
70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
72 | 75 | ||
73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
75 | QMAKE_DEL_FILE = rm -f | 78 | 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 | |||
@@ -1,20 +1,23 @@ | |||
1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
3 | 3 | ||
4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
5 | 5 | ||
6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
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 | #ifndef _POSIX_PTHREAD_SEMANTICS | ||
10 | #define _POSIX_PTHREAD_SEMANTICS | ||
11 | #endif | ||
9 | 12 | ||
10 | #include <unistd.h> | 13 | #include <unistd.h> |
11 | 14 | ||
12 | 15 | ||
13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 16 | // We are hot - unistd.h should have turned on the specific APIs we requested |
14 | 17 | ||
15 | 18 | ||
16 | #ifdef QT_THREAD_SUPPORT | 19 | #ifdef QT_THREAD_SUPPORT |
17 | #include <pthread.h> | 20 | #include <pthread.h> |
18 | #endif | 21 | #endif |
19 | 22 | ||
20 | #include <dirent.h> | 23 | #include <dirent.h> |
@@ -68,31 +71,34 @@ | |||
68 | #define QT_OPEN_WRONLY O_WRONLY | 71 | #define QT_OPEN_WRONLY O_WRONLY |
69 | #define QT_OPEN_RDWR O_RDWR | 72 | #define QT_OPEN_RDWR O_RDWR |
70 | #define QT_OPEN_CREAT O_CREAT | 73 | #define QT_OPEN_CREAT O_CREAT |
71 | #define QT_OPEN_TRUNC O_TRUNC | 74 | #define QT_OPEN_TRUNC O_TRUNC |
72 | #define QT_OPEN_APPEND O_APPEND | 75 | #define QT_OPEN_APPEND O_APPEND |
73 | #endif | 76 | #endif |
74 | 77 | ||
75 | #define QT_SIGNAL_RETTYPEvoid | 78 | #define QT_SIGNAL_RETTYPEvoid |
76 | #define QT_SIGNAL_ARGS int | 79 | #define QT_SIGNAL_ARGS int |
77 | #define QT_SIGNAL_IGNORESIG_IGN | 80 | #define QT_SIGNAL_IGNORESIG_IGN |
78 | 81 | ||
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 |
84 | // not defined by <unistd.h> when XPG4v2 is not supported. | 89 | // not defined by <unistd.h> when XPG4v2 is not supported. |
85 | typedef unsigned int useconds_t; | 90 | 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 |
88 | 94 | ||
89 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500) | 95 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500) |
90 | // on Solaris 7 and better with specific feature test macros | 96 | // on Solaris 7 and better with specific feature test macros |
91 | #define QT_SOCKLEN_T socklen_t | 97 | #define QT_SOCKLEN_T socklen_t |
92 | #elif defined(_XOPEN_SOURCE_EXTENDED) && defined(_XOPEN_UNIX) | 98 | #elif defined(_XOPEN_SOURCE_EXTENDED) && defined(_XOPEN_UNIX) |
93 | // on Solaris 2.6 and better with specific feature test macros | 99 | // on Solaris 2.6 and better with specific feature test macros |
94 | #define QT_SOCKLEN_T size_t | 100 | #define QT_SOCKLEN_T size_t |
95 | #else | 101 | #else |
96 | // always this case in practice | 102 | // always this case in practice |
97 | #define QT_SOCKLEN_T int | 103 | #define QT_SOCKLEN_T int |
98 | #endif | 104 | #endif |