-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 | |||
@@ -8,3 +8,3 @@ MAKEFILE_GENERATOR = UNIX | |||
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl |
10 | 10 | ||
@@ -23,3 +23,3 @@ QMAKE_CFLAGS_SHLIB = | |||
23 | QMAKE_CFLAGS_YACC= | 23 | QMAKE_CFLAGS_YACC= |
24 | QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -qthreaded |
25 | 25 | ||
@@ -51,4 +51,4 @@ QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 \ | |||
51 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ | 51 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ |
52 | ar q lib$(QMAKE_TARGET).a $(TARGETD); \ | 52 | $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ |
53 | ranlib lib$(QMAKE_TARGET).a; \ | 53 | $(RANLIB) lib$(QMAKE_TARGET).a; \ |
54 | mv lib$(QMAKE_TARGET).a $(DESTDIR) | 54 | mv lib$(QMAKE_TARGET).a $(DESTDIR) |
@@ -61,2 +61,3 @@ QMAKE_LFLAGS_SONAME = | |||
61 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads | 61 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads |
62 | QMAKE_AIX_SHLIB = 1 | ||
62 | 63 | ||
@@ -85 +86,3 @@ QMAKE_DEL_FILE = rm -f | |||
85 | QMAKE_DEL_DIR = rmdir | 86 | QMAKE_DEL_DIR = rmdir |
87 | QMAKE_CHK_DIR_EXISTS= test -d | ||
88 | 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 | |||
@@ -97,3 +97,3 @@ | |||
97 | 97 | ||
98 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | 98 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) |
99 | // AIX 4.3 and better only | 99 | // AIX 4.3 and better only |