| -rw-r--r-- | mkspecs/aix-xlc/qmake.conf | 11 | ||||
| -rw-r--r-- | mkspecs/aix-xlc/qplatformdefs.h | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index 76ead61..3ce593c 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf @@ -1,85 +1,88 @@ # # $Id$ # # qmake configuration for aix-xlc # MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release link_prl QMAKE_CC = xlc QMAKE_CC_THREAD = xlc_r QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -qstrict $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = QMAKE_CFLAGS_WARN_OFF = QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3) QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -qthreaded -D_THREAD_SAFE +QMAKE_CFLAGS_THREAD = -qthreaded QMAKE_CXX = xlC QMAKE_CXX_THREAD = xlC_r QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = QMAKE_LINK = xlC QMAKE_LINK_THREAD = xlC_r QMAKE_LINK_SHLIB = ld QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 \ -o $(TARGETD) \ $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ - ar q lib$(QMAKE_TARGET).a $(TARGETD); \ - ranlib lib$(QMAKE_TARGET).a; \ + $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ + $(RANLIB) lib$(QMAKE_TARGET).a; \ mv lib$(QMAKE_TARGET).a $(DESTDIR) QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = QMAKE_LFLAGS_THREAD = -L/usr/lib/threads +QMAKE_AIX_SHLIB = 1 QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind QMAKE_LIBS_X11SM = -lSM -lICE QMAKE_LIBS_QT = -lqt QMAKE_LIBS_QT_THREAD = -lqt-mt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthreads QMAKE_MOC = $(QTDIR)/bin/moc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib QMAKE_TAR = tar -cf QMAKE_GZIP = gzip -9f QMAKE_COPY = cp -f 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/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h index 7685a7b..79afa5d 100644 --- a/mkspecs/aix-xlc/qplatformdefs.h +++ b/mkspecs/aix-xlc/qplatformdefs.h @@ -1,105 +1,105 @@ #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 <strings.h> // AIX X11 headers define FD_ZERO using bzero() #include <sys/types.h> #include <sys/ioctl.h> #include <sys/ipc.h> #include <sys/time.h> #include <sys/select.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 AIX 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 nsrr_class // AIX 4.3.1.0 #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 #ifdef _AIX43 // AIX 4.3 // The AIX 4.3 online documentation says 'size_t' but a user asked IBM // and they told him the documentation is wrong. And anyway 'socklen_t' // reportedly works for all AIX 4.3 users. #define QT_SOCKLEN_T socklen_t #elif _AIX42 // AIX 4.2 #define QT_SOCKLEN_T size_t #else // AIX 4.1 #define QT_SOCKLEN_T size_t // override #define QT_SOCKOPTLEN_T int #endif -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) // AIX 4.3 and better only #define QT_SNPRINTF ::snprintf #define QT_VSNPRINTF ::vsnprintf #endif #endif // QPLATFORMDEFS_H |