-rw-r--r-- | mkspecs/irix-cc-64/qmake.conf | 8 | ||||
-rw-r--r-- | mkspecs/irix-cc-64/qplatformdefs.h | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index 8035658..be50743 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for irix-64 | 4 | # qmake configuration for irix-cc-64 |
5 | # | 5 | # |
6 | # From cc(1): | 6 | # From cc(1): |
7 | # -64 | 7 | # -64 |
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | MAKEFILE_GENERATOR= UNIX | 39 | MAKEFILE_GENERATOR= UNIX |
40 | TEMPLATE = app | 40 | TEMPLATE = app |
41 | CONFIG += qt warn_on release | 41 | CONFIG += qt warn_on release link_prl |
42 | 42 | ||
43 | QMAKE_CC = cc | 43 | QMAKE_CC = cc |
44 | QMAKE_LEX = flex | 44 | QMAKE_LEX = flex |
@@ -56,7 +56,7 @@ QMAKE_CFLAGS_YACC = -woff 1110,1174,3262 | |||
56 | QMAKE_CFLAGS_THREAD= | 56 | QMAKE_CFLAGS_THREAD= |
57 | 57 | ||
58 | QMAKE_CXX = CC | 58 | QMAKE_CXX = CC |
59 | QMAKE_CXXFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) | 59 | QMAKE_CXXFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1424,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) |
60 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 60 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
61 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 61 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
62 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 62 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
@@ -111,3 +111,5 @@ QMAKE_COPY = cp -f | |||
111 | QMAKE_MOVE = mv -f | 111 | QMAKE_MOVE = mv -f |
112 | QMAKE_DEL_FILE = rm -f | 112 | QMAKE_DEL_FILE = rm -f |
113 | QMAKE_DEL_DIR = rmdir | 113 | QMAKE_DEL_DIR = rmdir |
114 | QMAKE_CHK_DIR_EXISTS= test -d | ||
115 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h index c6eaa2f..8666daf 100644 --- a/mkspecs/irix-cc-64/qplatformdefs.h +++ b/mkspecs/irix-cc-64/qplatformdefs.h | |||
@@ -75,7 +75,11 @@ | |||
75 | #define QT_SIGNAL_ARGS int | 75 | #define QT_SIGNAL_ARGS int |
76 | #define QT_SIGNAL_IGNORESIG_IGN | 76 | #define QT_SIGNAL_IGNORESIG_IGN |
77 | 77 | ||
78 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) | ||
79 | #define QT_SOCKLEN_T size_t | ||
80 | #else | ||
78 | #define QT_SOCKLEN_T int | 81 | #define QT_SOCKLEN_T int |
82 | #endif | ||
79 | 83 | ||
80 | #if 0 | 84 | #if 0 |
81 | // on Irix 6.5 and better only - but how to check for it? | 85 | // on Irix 6.5 and better only - but how to check for it? |