-rw-r--r-- | mkspecs/irix-cc/qmake.conf | 8 | ||||
-rw-r--r-- | mkspecs/irix-cc/qplatformdefs.h | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf index 31411af..469a473 100644 --- a/mkspecs/irix-cc/qmake.conf +++ b/mkspecs/irix-cc/qmake.conf | |||
@@ -1,10 +1,10 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for irix-n32 | 4 | # qmake configuration for irix-cc |
5 | # | 5 | # |
6 | # From cc(1): | 6 | # From cc(1): |
7 | # -n32 | 7 | # -n32 |
8 | # Generates a (new) 32-bit object. This defaults to -mips3 if | 8 | # Generates a (new) 32-bit object. This defaults to -mips3 if |
9 | # -mips4 has not been specified. | 9 | # -mips4 has not been specified. |
10 | # -LANG: ... | 10 | # -LANG: ... |
@@ -35,13 +35,13 @@ | |||
35 | # triggers other standard-conforming behavior, such as the | 35 | # triggers other standard-conforming behavior, such as the |
36 | # new rules for the scope of for loop initializers. | 36 | # new rules for the scope of for loop initializers. |
37 | # | 37 | # |
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 |
45 | QMAKE_LEXFLAGS = | 45 | QMAKE_LEXFLAGS = |
46 | QMAKE_YACC = yacc | 46 | QMAKE_YACC = yacc |
47 | QMAKE_YACCFLAGS = -d | 47 | QMAKE_YACCFLAGS = -d |
@@ -53,13 +53,13 @@ QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit | |||
53 | QMAKE_CFLAGS_DEBUG= -g | 53 | QMAKE_CFLAGS_DEBUG= -g |
54 | QMAKE_CFLAGS_SHLIB= | 54 | QMAKE_CFLAGS_SHLIB= |
55 | QMAKE_CFLAGS_YACC= -woff 1110,1174,3262 | 55 | 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 = -n32 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) | 59 | QMAKE_CXXFLAGS = -n32 -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 |
63 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 63 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
64 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 64 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
65 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 65 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
@@ -108,6 +108,8 @@ QMAKE_TAR = tar -cf | |||
108 | QMAKE_GZIP = gzip -9f | 108 | QMAKE_GZIP = gzip -9f |
109 | 109 | ||
110 | QMAKE_COPY = cp -f | 110 | 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/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h index c6eaa2f..8666daf 100644 --- a/mkspecs/irix-cc/qplatformdefs.h +++ b/mkspecs/irix-cc/qplatformdefs.h | |||
@@ -72,13 +72,17 @@ | |||
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | #define QT_SIGNAL_RETTYPEvoid | 74 | #define QT_SIGNAL_RETTYPEvoid |
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? |
82 | #if defined(_SGIAPI) | 86 | #if defined(_SGIAPI) |
83 | #define QT_SNPRINTF ::snprintf | 87 | #define QT_SNPRINTF ::snprintf |
84 | #define QT_VSNPRINTF ::vsnprintf | 88 | #define QT_VSNPRINTF ::vsnprintf |