| -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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = gcc @@ -40,4 +40,6 @@ QMAKE_LIBDIR = /usr/local/lib QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = g++ @@ -56,4 +58,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_THREAD = +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_MOC = $(QTDIR)/bin/moc @@ -70,2 +73,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ +#ifndef QPLATFORMDEFS_H +#define QPLATFORMDEFS_H + +// Get Qt defines/settings + +#include "qglobal.h" + +// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs + +#include <unistd.h> + + +// We are hot - unistd.h should have turned on the specific APIs we requested + + +#ifdef QT_THREAD_SUPPORT +#include <pthread.h> +#endif + +#include <dirent.h> +#include <fcntl.h> +#include <grp.h> +#include <pwd.h> +#include <signal.h> +#include <dlfcn.h> + +#include <sys/types.h> +#include <sys/ioctl.h> +#include <sys/ipc.h> +#include <sys/time.h> +#include <sys/shm.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <sys/wait.h> + +// DNS header files are not fully covered by X/Open specifications. +// In particular nothing is said about res_* :/ +// On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not +// included by <resolv.h>. Note that <arpa/nameser.h> must be included +// before <resolv.h>. +#include <netinet/in.h> +#define class c_class // FreeeBSD 3.x +#include <arpa/nameser.h> +#undef class +#include <resolv.h> + + +#if !defined(QT_NO_COMPAT) +#define QT_STATBUF struct stat +#define QT_STATBUF4TSTAT struct stat +#define QT_STAT ::stat +#define QT_FSTAT ::fstat +#define QT_STAT_REG S_IFREG +#define QT_STAT_DIR S_IFDIR +#define QT_STAT_MASK S_IFMT +#define QT_STAT_LNK S_IFLNK +#define QT_FILENO fileno +#define QT_OPEN ::open +#define QT_CLOSE ::close +#define QT_LSEEK ::lseek +#define QT_READ ::read +#define QT_WRITE ::write +#define QT_ACCESS ::access +#define QT_GETCWD ::getcwd +#define QT_CHDIR ::chdir +#define QT_MKDIR ::mkdir +#define QT_RMDIR ::rmdir +#define QT_OPEN_RDONLY O_RDONLY +#define QT_OPEN_WRONLY O_WRONLY +#define QT_OPEN_RDWR O_RDWR +#define QT_OPEN_CREAT O_CREAT +#define QT_OPEN_TRUNC O_TRUNC +#define QT_OPEN_APPEND O_APPEND +#endif + +#define QT_SIGNAL_RETTYPE void +#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_IGNORE SIG_IGN + +#if __FreeBSD_version < 400000 +// FreeBSD 1.0 - 3.5.1 +# define QT_SOCKLEN_T int +#else +// FreeBSD 4.0 - 5.0 +# define QT_SOCKLEN_T socklen_t +#endif + +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf + +// Older FreeBSD versions may still use the a.out format instead of ELF. +// From the FreeBSD man pages: +// In previous implementations, it was necessary to prepend an +// underscore to all external symbols in order to gain symbol +// compatibility with object code compiled from the C language. +// This is still the case when using the (obsolete) -aout option to +// the C language compiler. +#ifndef __ELF__ +#define QT_AOUT_UNDERSCORE +#endif + + +#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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = arm-linux-gcc @@ -41,7 +41,9 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib -QMAKE_LINK = arm-linux-gcc -QMAKE_LINK_SHLIB = arm-linux-gcc +QMAKE_LINK = arm-linux-g++ +QMAKE_LINK_SHLIB = arm-linux-g++ QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = @@ -60,4 +62,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = -lpthread @@ -75,2 +78,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = $(CCACHE) $(DISTCC) gcc @@ -41,4 +41,6 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include/ +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = g++ @@ -60,4 +62,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = -lpthread @@ -75,2 +78,5 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = strip +QMAKE_CHK_DIR_EXISTS = test -d +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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = arm-linux-gcc @@ -41,7 +41,9 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib -QMAKE_LINK = arm-linux-gcc -QMAKE_LINK_SHLIB = arm-linux-gcc +QMAKE_LINK = arm-linux-g++ +QMAKE_LINK_SHLIB = arm-linux-g++ QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = @@ -51,5 +53,5 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath-link, +QMAKE_RPATH = -Wl,-rpath, QMAKE_LIBS = $(LIBS_EXTRA) @@ -60,4 +62,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = -lpthread @@ -75,2 +78,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = mipsel-linux-gcc @@ -41,4 +41,6 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = mipsel-linux-g++ @@ -60,4 +62,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = -lpthread @@ -75,2 +78,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -21,5 +21,5 @@ QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA) +QMAKE_CFLAGS = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = @@ -51,5 +51,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib QMAKE_LINK = arm-linux-gcc QMAKE_LINK_SHLIB = arm-linux-gcc -QMAKE_LFLAGS = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA) +QMAKE_LFLAGS = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -60,5 +60,5 @@ QMAKE_LFLAGS_THREAD = QMAKE_RPATH = -Wl,-rpath, -QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = @@ -82,2 +82,5 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = strip +QMAKE_CHK_DIR_EXISTS = test -d +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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = arm-linux-gcc @@ -23,5 +23,5 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_THREAD = -D_REENTRANT -QMAKE_CXX = arm-linux-g++ -DQT_QWS_SL5XXX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM +QMAKE_CXX = arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -41,7 +41,9 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib -QMAKE_LINK = arm-linux-gcc -QMAKE_LINK_SHLIB = arm-linux-gcc +QMAKE_LINK = arm-linux-g++ +QMAKE_LINK_SHLIB = arm-linux-g++ QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = @@ -60,4 +62,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = -lpthread @@ -75,2 +78,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -14,5 +14,5 @@ QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = @@ -24,5 +24,5 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = $(CCACHE) arm-linux-g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF @@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib QMAKE_LINK = arm-linux-gcc QMAKE_LINK_SHLIB = arm-linux-gcc -QMAKE_LFLAGS = $(LFLAGS_EXTRA) +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -53,5 +53,5 @@ QMAKE_LFLAGS_THREAD = QMAKE_RPATH = -Wl,-rpath, -QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = @@ -75,2 +75,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = gcc @@ -41,4 +41,6 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = g++ @@ -60,4 +62,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = -lpthread @@ -75,2 +78,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -14,5 +14,5 @@ QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = @@ -75,2 +75,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_EXTENSION_SHLIB = dylib @@ -25,5 +25,6 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = $(TB)c++ -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 +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) +DEFINES += QWS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF @@ -42,4 +43,6 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = $$QMAKE_CXX @@ -59,7 +62,7 @@ QMAKE_LIBS_X11 = QMAKE_LIBS_X11SM = QMAKE_LIBS_QT = -lqte -#QMAKE_LIBS_QT = libqte.dylib QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = @@ -77,5 +80,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir - - - +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release no_mocdepend +CONFIG += qt no_mocdepend link_prl QMAKE_CC = cc @@ -17,5 +17,5 @@ QMAKE_CFLAGS = -WC,-sg $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -w1 QMAKE_CFLAGS_WARN_OFF = -w0 -QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) +QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) QMAKE_CFLAGS_DEBUG = -g2d QMAKE_CFLAGS_SHLIB = @@ -24,5 +24,5 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT -WC,-bm QMAKE_CXX = cc -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS $(CXXFLAGS_EXTRA) +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS $(CXXFLAGS_EXTRA) 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 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -38,8 +38,10 @@ QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = cc QMAKE_LINK_SHLIB = cc -QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA) +QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = -g2d @@ -50,8 +52,9 @@ QMAKE_LFLAGS_THREAD = QMAKE_RPATH = -QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS = -lsocket $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_QT = -T 1 -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = @@ -69,2 +72,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = cc @@ -41,8 +41,10 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = cc QMAKE_LINK_SHLIB = cc -QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) +QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -53,5 +55,5 @@ QMAKE_LFLAGS_THREAD = QMAKE_RPATH = -Wl,-rpath, -QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS = -lsocket -lcpp $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_X11 = -ldisputil -lm @@ -60,4 +62,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = -lpthread @@ -75,3 +78,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir - +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = cc @@ -41,8 +41,10 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = cc -fhonor-std QMAKE_LINK_SHLIB = cc -fhonor-std -QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) +QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -53,5 +55,5 @@ QMAKE_LFLAGS_THREAD = QMAKE_RPATH = -Wl,-rpath, -QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS = -lsocket $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_X11 = -ldisputil -lm @@ -60,4 +62,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = -lpthread @@ -75,3 +78,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir - +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -7,5 +7,5 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt link_prl QMAKE_CC = gcc @@ -41,4 +41,6 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = g++ @@ -53,5 +55,5 @@ QMAKE_LFLAGS_THREAD = QMAKE_RPATH = -Wl,-rpath, -QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS = -lsocket -lnsl -lresolv $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = @@ -60,4 +62,5 @@ QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = -lthread -lrt @@ -75,2 +78,4 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ -7,4 +7,7 @@ // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs +#ifndef _POSIX_PTHREAD_SEMANTICS +#define _POSIX_PTHREAD_SEMANTICS +#endif #include <unistd.h> @@ -78,11 +81,14 @@ #if !defined(_XOPEN_UNIX) -// Function usleep() is in C library but not in header files on Solaris 2.5.1. -// Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only -// supported by Solaris 2.6 and better. +// Function usleep() is defined in C library but not declared in header files +// on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2 +// and XPG4v2 is only supported by Solaris 2.6 and better. +// Function gethostname() is defined in C library but not declared in <unistd.h> +// on Solaris 2.5.1. // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is // not defined by <unistd.h> when XPG4v2 is not supported. typedef unsigned int useconds_t; extern "C" int usleep(useconds_t); +extern "C" int gethostname(char *, int); #endif |