| -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,20 +1,20 @@ # # $Id$ # -# qmake configuration for irix-64 +# qmake configuration for irix-cc-64 # # From cc(1): # -64 # Generates a 64-bit object. This defaults to -mips4 if -mips3 has # not been specified. # -LANG: ... # The language feature option group controls the source language # interpretation assumed by the compiler. The individual controls # in this group are as follows: # ansi-for-init-scope [ = ( ON|OFF ) ] # Enables or disables the ANSI scoping rules for for-init # declarations (the scope of the name declared extends to # the end of the for statement). This enables the behavior # that is required by the C++ standard. The default value # is OFF, which is the ARM behavior (the scope of the name # declared extends to the end of the block enclosing the for @@ -25,51 +25,51 @@ # only to suppress this type in old code that defines bool # itself. Because this option changes the mangling of function # names with bool parameters, all files comprising a program # should be compiled with consistent options. # Default is ON. # The _BOOL feature macro can be used in #ifdefs to do conditional # compilation based on whether or not this option is enabled. # std # Enables use of the standard C++ library and standard- # conforming iostream library. Specifying this flag also # triggers other standard-conforming behavior, such as the # new rules for the scope of for loop initializers. # MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release link_prl QMAKE_CC = cc QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -fullwarn QMAKE_CFLAGS_WARN_OFF = QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit=3000) QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = QMAKE_CFLAGS_YACC = -woff 1110,1174,3262 QMAKE_CFLAGS_THREAD = QMAKE_CXX = CC -QMAKE_CXXFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) +QMAKE_CXXFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1424,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS 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_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = @@ -98,16 +98,18 @@ QMAKE_LIBS_THREAD = -lpthread QMAKE_MOC = $(QTDIR)/bin/moc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = CC -ar -o QMAKE_RANLIB = QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files 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/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 @@ -62,27 +62,31 @@ #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 defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) +#define QT_SOCKLEN_T size_t +#else #define QT_SOCKLEN_T int +#endif #if 0 // on Irix 6.5 and better only - but how to check for it? #if defined(_SGIAPI) #define QT_SNPRINTF ::snprintf #define QT_VSNPRINTF ::vsnprintf #endif #endif #endif // QPLATFORMDEFS_H |