1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index 0113dac..cd6c432 100644
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -1,113 +1,113 @@
 #
 # $Id$
 #
 # qmake configuration for irix-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
        #       statement).
        #     bool [ = ( ON|OFF ) ]
        #       Enables or disables the predefined bool data type, along
        #       with the predefined values true and false. Use this option
        #       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
        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= -O2 -OPT:Olimit=3000
+        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_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=
        QMAKE_LIBDIR_OPENGL=
        QMAKE_LINK      = CC
        QMAKE_LINK_SHLIB= CC
        QMAKE_LFLAGS    = -64 $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB= -shared
        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
        QMAKE_LFLAGS_SONAME= -Wl,-soname,
        QMAKE_LFLAGS_THREAD=
        QMAKE_RPATH     = -Wl,-rpath,
        QMAKE_LIBS      =
        QMAKE_LIBS_DYNLOAD=
        QMAKE_LIBS_X11  = -lXext -lX11 -lm
        QMAKE_LIBS_X11SM= -lSM -lICE
        QMAKE_LIBS_QT   = -lqt
        QMAKE_LIBS_QT_THREAD= -lqt-mt
        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm
        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
        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

diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index 0113dac..cd6c432 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf
@@ -1,113 +1,113 @@
1	#	1	#
2	# $Id$	2	# $Id$
3	#	3	#
4	# qmake configuration for irix-64	4	# qmake configuration for irix-64
5	#	5	#
6	# From cc(1):	6	# From cc(1):
7	# -64	7	# -64
8	# Generates a 64-bit object. This defaults to -mips4 if -mips3 has	8	# Generates a 64-bit object. This defaults to -mips4 if -mips3 has
9	# not been specified.	9	# not been specified.
10	# -LANG: ...	10	# -LANG: ...
11	# The language feature option group controls the source language	11	# The language feature option group controls the source language
12	# interpretation assumed by the compiler. The individual controls	12	# interpretation assumed by the compiler. The individual controls
13	# in this group are as follows:	13	# in this group are as follows:
14	# ansi-for-init-scope [ = ( ON\|OFF ) ]	14	# ansi-for-init-scope [ = ( ON\|OFF ) ]
15	# Enables or disables the ANSI scoping rules for for-init	15	# Enables or disables the ANSI scoping rules for for-init
16	# declarations (the scope of the name declared extends to	16	# declarations (the scope of the name declared extends to
17	# the end of the for statement). This enables the behavior	17	# the end of the for statement). This enables the behavior
18	# that is required by the C++ standard. The default value	18	# that is required by the C++ standard. The default value
19	# is OFF, which is the ARM behavior (the scope of the name	19	# is OFF, which is the ARM behavior (the scope of the name
20	# declared extends to the end of the block enclosing the for	20	# declared extends to the end of the block enclosing the for
21	# statement).	21	# statement).
22	# bool [ = ( ON\|OFF ) ]	22	# bool [ = ( ON\|OFF ) ]
23	# Enables or disables the predefined bool data type, along	23	# Enables or disables the predefined bool data type, along
24	# with the predefined values true and false. Use this option	24	# with the predefined values true and false. Use this option
25	# only to suppress this type in old code that defines bool	25	# only to suppress this type in old code that defines bool
26	# itself. Because this option changes the mangling of function	26	# itself. Because this option changes the mangling of function
27	# names with bool parameters, all files comprising a program	27	# names with bool parameters, all files comprising a program
28	# should be compiled with consistent options.	28	# should be compiled with consistent options.
29	# Default is ON.	29	# Default is ON.
30	# The _BOOL feature macro can be used in #ifdefs to do conditional	30	# The _BOOL feature macro can be used in #ifdefs to do conditional
31	# compilation based on whether or not this option is enabled.	31	# compilation based on whether or not this option is enabled.
32	# std	32	# std
33	# Enables use of the standard C++ library and standard-	33	# Enables use of the standard C++ library and standard-
34	# conforming iostream library. Specifying this flag also	34	# conforming iostream library. Specifying this flag also
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
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
48	QMAKE_CFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA)	48	QMAKE_CFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA)
49	QMAKE_CFLAGS_DEPS= -M	49	QMAKE_CFLAGS_DEPS= -M
50	QMAKE_CFLAGS_WARN_ON= -fullwarn	50	QMAKE_CFLAGS_WARN_ON= -fullwarn
51	QMAKE_CFLAGS_WARN_OFF=	51	QMAKE_CFLAGS_WARN_OFF=
52	QMAKE_CFLAGS_RELEASE= -O2 -OPT:Olimit=3000	52	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit=3000)
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 = -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,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
66	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	66	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
67	QMAKE_CXXFLAGS_THREAD=	67	QMAKE_CXXFLAGS_THREAD=
68		68
69	QMAKE_INCDIR =	69	QMAKE_INCDIR =
70	QMAKE_LIBDIR =	70	QMAKE_LIBDIR =
71	QMAKE_INCDIR_X11=	71	QMAKE_INCDIR_X11=
72	QMAKE_LIBDIR_X11=	72	QMAKE_LIBDIR_X11=
73	QMAKE_INCDIR_QT = $(QTDIR)/include	73	QMAKE_INCDIR_QT = $(QTDIR)/include
74	QMAKE_LIBDIR_QT = $(QTDIR)/lib	74	QMAKE_LIBDIR_QT = $(QTDIR)/lib
75	QMAKE_INCDIR_OPENGL=	75	QMAKE_INCDIR_OPENGL=
76	QMAKE_LIBDIR_OPENGL=	76	QMAKE_LIBDIR_OPENGL=
77		77
78	QMAKE_LINK = CC	78	QMAKE_LINK = CC
79	QMAKE_LINK_SHLIB= CC	79	QMAKE_LINK_SHLIB= CC
80	QMAKE_LFLAGS = -64 $(LFLAGS_EXTRA)	80	QMAKE_LFLAGS = -64 $(LFLAGS_EXTRA)
81	QMAKE_LFLAGS_RELEASE=	81	QMAKE_LFLAGS_RELEASE=
82	QMAKE_LFLAGS_DEBUG=	82	QMAKE_LFLAGS_DEBUG=
83	QMAKE_LFLAGS_SHLIB= -shared	83	QMAKE_LFLAGS_SHLIB= -shared
84	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB	84	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
85	QMAKE_LFLAGS_SONAME= -Wl,-soname,	85	QMAKE_LFLAGS_SONAME= -Wl,-soname,
86	QMAKE_LFLAGS_THREAD=	86	QMAKE_LFLAGS_THREAD=
87	QMAKE_RPATH = -Wl,-rpath,	87	QMAKE_RPATH = -Wl,-rpath,
88		88
89	QMAKE_LIBS =	89	QMAKE_LIBS =
90	QMAKE_LIBS_DYNLOAD=	90	QMAKE_LIBS_DYNLOAD=
91	QMAKE_LIBS_X11 = -lXext -lX11 -lm	91	QMAKE_LIBS_X11 = -lXext -lX11 -lm
92	QMAKE_LIBS_X11SM= -lSM -lICE	92	QMAKE_LIBS_X11SM= -lSM -lICE
93	QMAKE_LIBS_QT = -lqt	93	QMAKE_LIBS_QT = -lqt
94	QMAKE_LIBS_QT_THREAD= -lqt-mt	94	QMAKE_LIBS_QT_THREAD= -lqt-mt
95	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm	95	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm
96	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu	96	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
97	QMAKE_LIBS_THREAD= -lpthread	97	QMAKE_LIBS_THREAD= -lpthread
98		98
99	QMAKE_MOC = $(QTDIR)/bin/moc	99	QMAKE_MOC = $(QTDIR)/bin/moc
100	QMAKE_UIC = $(QTDIR)/bin/uic	100	QMAKE_UIC = $(QTDIR)/bin/uic
101		101
102	QMAKE_AR = CC -ar -o	102	QMAKE_AR = CC -ar -o
103	QMAKE_RANLIB =	103	QMAKE_RANLIB =
104		104
105	QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files	105	QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
106		106
107	QMAKE_TAR = tar -cf	107	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