author | kergoth <kergoth> | 2002-11-06 22:45:24 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 22:45:24 (UTC) |
commit | e44cdb16632a4c904d8c43471fea1f8e790c7651 (patch) (unidiff) | |
tree | 6533f63c234a24959587aa49de0934f7b35ce26f /mkspecs/linux-icc | |
parent | 86a2bf4747f46a9915dffac376b888faa5400ec8 (diff) | |
download | opie-e44cdb16632a4c904d8c43471fea1f8e790c7651.zip opie-e44cdb16632a4c904d8c43471fea1f8e790c7651.tar.gz opie-e44cdb16632a4c904d8c43471fea1f8e790c7651.tar.bz2 |
allow a means of overriding CFLAGS_RELEASE, as a means of passing in optimizations
-rw-r--r-- | mkspecs/linux-icc/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index cd13562..f6b721d 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf | |||
@@ -1,68 +1,68 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for Intel C++ 5.0.1, 6.0, and 7.0 for Linux | 4 | # qmake configuration for Intel C++ 5.0.1, 6.0, and 7.0 for Linux |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release |
10 | 10 | ||
11 | QMAKE_CC = icc | 11 | QMAKE_CC = icc |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
18 | QMAKE_CFLAGS_WARN_ON= | 18 | QMAKE_CFLAGS_WARN_ON= |
19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
22 | QMAKE_CFLAGS_SHLIB= -KPIC | 22 | QMAKE_CFLAGS_SHLIB= -KPIC |
23 | QMAKE_CFLAGS_YACC= | 23 | QMAKE_CFLAGS_YACC= |
24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
25 | 25 | ||
26 | QMAKE_CXX = icpc | 26 | QMAKE_CXX = icpc |
27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
36 | 36 | ||
37 | QMAKE_INCDIR = | 37 | QMAKE_INCDIR = |
38 | QMAKE_LIBDIR = | 38 | QMAKE_LIBDIR = |
39 | QMAKE_INCDIR_X11= /usr/X11R6/include | 39 | QMAKE_INCDIR_X11= /usr/X11R6/include |
40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
45 | 45 | ||
46 | QMAKE_LINK = icpc | 46 | QMAKE_LINK = icpc |
47 | QMAKE_LINK_SHLIB= icpc | 47 | QMAKE_LINK_SHLIB= icpc |
48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
49 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
50 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
51 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
53 | QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname, |
54 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
55 | QMAKE_RPATH = -Qoption,ld,-rpath, | 55 | QMAKE_RPATH = -Qoption,ld,-rpath, |
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = |
58 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
60 | QMAKE_LIBS_X11SM= -lSM -lICE | 60 | QMAKE_LIBS_X11SM= -lSM -lICE |
61 | QMAKE_LIBS_NIS = -lnsl | 61 | QMAKE_LIBS_NIS = -lnsl |
62 | QMAKE_LIBS_QT = -lqt | 62 | QMAKE_LIBS_QT = -lqt |
63 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 63 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
66 | QMAKE_LIBS_THREAD= -lpthread | 66 | QMAKE_LIBS_THREAD= -lpthread |
67 | 67 | ||
68 | QMAKE_MOC = $(QTDIR)/bin/moc | 68 | QMAKE_MOC = $(QTDIR)/bin/moc |