61 files changed, 190 insertions, 190 deletions
diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf index cbd4424..5eb2f5e 100644 --- a/mkspecs/aix-g++/qmake.conf +++ b/mkspecs/aix-g++/qmake.conf | |||
| @@ -10,25 +10,25 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -D_THREAD_SAFE |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 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 |
| @@ -42,13 +42,13 @@ 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 = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = | 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= | 53 | QMAKE_LFLAGS_SONAME= |
| 54 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads | 54 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads |
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf index 78be355..bdbec01 100644 --- a/mkspecs/aix-xlc-64/qmake.conf +++ b/mkspecs/aix-xlc-64/qmake.conf | |||
| @@ -11,24 +11,24 @@ CONFIG += qt warn_on release | |||
| 11 | QMAKE_CC = xlc | 11 | QMAKE_CC = xlc |
| 12 | QMAKE_CC_THREAD = xlc_r | 12 | QMAKE_CC_THREAD = xlc_r |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = -qstrict -q64 | 17 | QMAKE_CFLAGS = -qstrict -q64 $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_WARN_ON= -qwarn64 | 18 | QMAKE_CFLAGS_WARN_ON= -qwarn64 |
| 19 | QMAKE_CFLAGS_WARN_OFF= | 19 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= -O3 | 20 | QMAKE_CFLAGS_RELEASE= -O3 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= | 23 | QMAKE_CFLAGS_YACC= |
| 24 | QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE |
| 25 | 25 | ||
| 26 | QMAKE_CXX = xlC | 26 | QMAKE_CXX = xlC |
| 27 | QMAKE_CXX_THREAD= xlC_r | 27 | QMAKE_CXX_THREAD= xlC_r |
| 28 | QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 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 |
| @@ -49,13 +49,13 @@ QMAKE_LINK_SHLIB = ld | |||
| 49 | QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 -X64 \ | 49 | QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 -X64 \ |
| 50 | -o $(TARGETD) \ | 50 | -o $(TARGETD) \ |
| 51 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ | 51 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ |
| 52 | $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ | 52 | $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ |
| 53 | $(RANLIB) lib$(QMAKE_TARGET).a; \ | 53 | $(RANLIB) lib$(QMAKE_TARGET).a; \ |
| 54 | mv lib$(QMAKE_TARGET).a $(DESTDIR) | 54 | mv lib$(QMAKE_TARGET).a $(DESTDIR) |
| 55 | QMAKE_LFLAGS = -q64 | 55 | QMAKE_LFLAGS = -q64 $(LFLAGS_EXTRA) |
| 56 | QMAKE_LFLAGS_RELEASE= | 56 | QMAKE_LFLAGS_RELEASE= |
| 57 | QMAKE_LFLAGS_DEBUG= | 57 | QMAKE_LFLAGS_DEBUG= |
| 58 | QMAKE_LFLAGS_SHLIB= | 58 | QMAKE_LFLAGS_SHLIB= |
| 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 60 | QMAKE_LFLAGS_SONAME= | 60 | QMAKE_LFLAGS_SONAME= |
| 61 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads | 61 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads |
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index 364d909..c74459d 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf | |||
| @@ -11,24 +11,24 @@ CONFIG += qt warn_on release | |||
| 11 | QMAKE_CC = xlc | 11 | QMAKE_CC = xlc |
| 12 | QMAKE_CC_THREAD = xlc_r | 12 | QMAKE_CC_THREAD = xlc_r |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = -qstrict | 17 | QMAKE_CFLAGS = -qstrict $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_WARN_ON= | 18 | QMAKE_CFLAGS_WARN_ON= |
| 19 | QMAKE_CFLAGS_WARN_OFF= | 19 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= -O3 | 20 | QMAKE_CFLAGS_RELEASE= -O3 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= | 23 | QMAKE_CFLAGS_YACC= |
| 24 | QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE |
| 25 | 25 | ||
| 26 | QMAKE_CXX = xlC | 26 | QMAKE_CXX = xlC |
| 27 | QMAKE_CXX_THREAD= xlC_r | 27 | QMAKE_CXX_THREAD= xlC_r |
| 28 | QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 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 |
| @@ -49,13 +49,13 @@ QMAKE_LINK_SHLIB = ld | |||
| 49 | QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \ | 49 | QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \ |
| 50 | -o $(TARGETD) \ | 50 | -o $(TARGETD) \ |
| 51 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ | 51 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ |
| 52 | ar q lib$(QMAKE_TARGET).a $(TARGETD); \ | 52 | ar q lib$(QMAKE_TARGET).a $(TARGETD); \ |
| 53 | ranlib lib$(QMAKE_TARGET).a; \ | 53 | ranlib lib$(QMAKE_TARGET).a; \ |
| 54 | mv lib$(QMAKE_TARGET).a $(DESTDIR) | 54 | mv lib$(QMAKE_TARGET).a $(DESTDIR) |
| 55 | QMAKE_LFLAGS = | 55 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 56 | QMAKE_LFLAGS_RELEASE= | 56 | QMAKE_LFLAGS_RELEASE= |
| 57 | QMAKE_LFLAGS_DEBUG= | 57 | QMAKE_LFLAGS_DEBUG= |
| 58 | QMAKE_LFLAGS_SHLIB= | 58 | QMAKE_LFLAGS_SHLIB= |
| 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 60 | QMAKE_LFLAGS_SONAME= | 60 | QMAKE_LFLAGS_SONAME= |
| 61 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads | 61 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads |
diff --git a/mkspecs/bsdi-g++/qmake.conf b/mkspecs/bsdi-g++/qmake.conf index 2c735af..4b48706 100644 --- a/mkspecs/bsdi-g++/qmake.conf +++ b/mkspecs/bsdi-g++/qmake.conf | |||
| @@ -12,24 +12,24 @@ CONFIG += qt warn_on release | |||
| 12 | 12 | ||
| 13 | QMAKE_CC = gcc | 13 | QMAKE_CC = gcc |
| 14 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 15 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 16 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 17 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 18 | QMAKE_CFLAGS = | 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 19 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= -O2 | 22 | QMAKE_CFLAGS_RELEASE= -O2 |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -fPIC | 24 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 26 | QMAKE_CFLAGS_THREAD= | 26 | QMAKE_CFLAGS_THREAD= |
| 27 | 27 | ||
| 28 | QMAKE_CXX = g++ | 28 | QMAKE_CXX = g++ |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -45,13 +45,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 46 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 46 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 47 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 47 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 48 | 48 | ||
| 49 | QMAKE_LINK = g++ | 49 | QMAKE_LINK = g++ |
| 50 | QMAKE_LINK_SHLIB= g++ | 50 | QMAKE_LINK_SHLIB= g++ |
| 51 | QMAKE_LFLAGS = | 51 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 52 | QMAKE_LFLAGS_RELEASE= | 52 | QMAKE_LFLAGS_RELEASE= |
| 53 | QMAKE_LFLAGS_DEBUG= | 53 | QMAKE_LFLAGS_DEBUG= |
| 54 | QMAKE_LFLAGS_SHLIB= -shared | 54 | QMAKE_LFLAGS_SHLIB= -shared |
| 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 57 | QMAKE_LFLAGS_THREAD= | 57 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index 3335084..9147bed 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf | |||
| @@ -11,24 +11,24 @@ QMAKE_INCREMENTAL_STYLE = sublib | |||
| 11 | 11 | ||
| 12 | QMAKE_CC = gcc | 12 | QMAKE_CC = gcc |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = -pipe | 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_DEPS= -M | 18 | QMAKE_CFLAGS_DEPS= -M |
| 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 20 | QMAKE_CFLAGS_WARN_OFF= -w | 20 | QMAKE_CFLAGS_WARN_OFF= -w |
| 21 | QMAKE_CFLAGS_RELEASE= -O2 | 21 | QMAKE_CFLAGS_RELEASE= -O2 |
| 22 | QMAKE_CFLAGS_DEBUG= -g | 22 | QMAKE_CFLAGS_DEBUG= -g |
| 23 | QMAKE_CFLAGS_SHLIB= | 23 | QMAKE_CFLAGS_SHLIB= |
| 24 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 24 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 25 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 25 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 26 | 26 | ||
| 27 | QMAKE_CXX = g++ | 27 | QMAKE_CXX = g++ |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -43,13 +43,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 46 | ||
| 47 | QMAKE_LINK = g++ | 47 | QMAKE_LINK = g++ |
| 48 | QMAKE_LINK_SHLIB= g++ | 48 | QMAKE_LINK_SHLIB= g++ |
| 49 | QMAKE_LFLAGS = | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 52 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | QMAKE_LFLAGS_THREAD= | 55 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf index b01c06e..9d057ea 100644 --- a/mkspecs/darwin-g++/qmake.conf +++ b/mkspecs/darwin-g++/qmake.conf | |||
| @@ -10,25 +10,25 @@ CONFIG += qt warn_on release resource_fork | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O3 | 20 | QMAKE_CFLAGS_RELEASE= -O3 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_EXTENSION_SHLIB= dylib | 23 | QMAKE_EXTENSION_SHLIB= dylib |
| 24 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 24 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 25 | QMAKE_CFLAGS_THREAD= | 25 | QMAKE_CFLAGS_THREAD= |
| 26 | 26 | ||
| 27 | QMAKE_CXX = c++ | 27 | QMAKE_CXX = c++ |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -43,13 +43,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 46 | ||
| 47 | QMAKE_LINK = c++ | 47 | QMAKE_LINK = c++ |
| 48 | QMAKE_LINK_SHLIB= c++ | 48 | QMAKE_LINK_SHLIB= c++ |
| 49 | QMAKE_LFLAGS = | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 52 | QMAKE_LFLAGS_SHLIB= -dynamiclib |
| 53 | QMAKE_LFLAGS_PLUGIN= -bundle | 53 | QMAKE_LFLAGS_PLUGIN= -bundle |
| 54 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
| 55 | QMAKE_RPATH = | 55 | QMAKE_RPATH = |
diff --git a/mkspecs/dgux-g++/qmake.conf b/mkspecs/dgux-g++/qmake.conf index f4628be..4de5c77 100644 --- a/mkspecs/dgux-g++/qmake.conf +++ b/mkspecs/dgux-g++/qmake.conf | |||
| @@ -12,23 +12,23 @@ CONFIG += qt warn_on release | |||
| 12 | 12 | ||
| 13 | QMAKE_CC = gcc | 13 | QMAKE_CC = gcc |
| 14 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 15 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 16 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 17 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 18 | QMAKE_CFLAGS = | 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 19 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= -O2 | 22 | QMAKE_CFLAGS_RELEASE= -O2 |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -fPIC | 24 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 26 | 26 | ||
| 27 | QMAKE_CXX = g++ | 27 | QMAKE_CXX = g++ |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -42,13 +42,13 @@ 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 = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = | 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= -Wl,-h, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-h, |
| 54 | 54 | ||
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index 722d898..33c401e 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -pthread -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -pthread -D_THREAD_SAFE |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 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 |
| @@ -43,13 +43,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 46 | ||
| 47 | QMAKE_LINK = g++ | 47 | QMAKE_LINK = g++ |
| 48 | QMAKE_LINK_SHLIB= g++ | 48 | QMAKE_LINK_SHLIB= g++ |
| 49 | QMAKE_LFLAGS = | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 52 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | QMAKE_LFLAGS_THREAD= -pthread | 55 | QMAKE_LFLAGS_THREAD= -pthread |
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf index 143e8cc..73e6093 100644 --- a/mkspecs/hpux-acc-64/qmake.conf +++ b/mkspecs/hpux-acc-64/qmake.conf | |||
| @@ -53,23 +53,23 @@ CONFIG += qt warn_on release | |||
| 53 | 53 | ||
| 54 | QMAKE_CC = cc | 54 | QMAKE_CC = cc |
| 55 | QMAKE_LEX = flex | 55 | QMAKE_LEX = flex |
| 56 | QMAKE_LEXFLAGS = | 56 | QMAKE_LEXFLAGS = |
| 57 | QMAKE_YACC = yacc | 57 | QMAKE_YACC = yacc |
| 58 | QMAKE_YACCFLAGS = -d | 58 | QMAKE_YACCFLAGS = -d |
| 59 | QMAKE_CFLAGS = -Ae +DA2.0W -w | 59 | QMAKE_CFLAGS = -Ae +DA2.0W -w $(CFLAGS_EXTRA) |
| 60 | QMAKE_CFLAGS_WARN_ON= | 60 | QMAKE_CFLAGS_WARN_ON= |
| 61 | QMAKE_CFLAGS_WARN_OFF= | 61 | QMAKE_CFLAGS_WARN_OFF= |
| 62 | QMAKE_CFLAGS_RELEASE= -O +Osize | 62 | QMAKE_CFLAGS_RELEASE= -O +Osize |
| 63 | QMAKE_CFLAGS_DEBUG= -g | 63 | QMAKE_CFLAGS_DEBUG= -g |
| 64 | QMAKE_CFLAGS_SHLIB= +Z | 64 | QMAKE_CFLAGS_SHLIB= +Z |
| 65 | QMAKE_CFLAGS_YACC= | 65 | QMAKE_CFLAGS_YACC= |
| 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE |
| 67 | 67 | ||
| 68 | QMAKE_CXX = aCC | 68 | QMAKE_CXX = aCC |
| 69 | QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ | 69 | QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) |
| 70 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 70 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 71 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 71 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 72 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 72 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 73 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 73 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 74 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 74 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 75 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 75 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -83,13 +83,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 83 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 83 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 84 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | 84 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include |
| 85 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 | 85 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 |
| 86 | 86 | ||
| 87 | QMAKE_LINK = aCC | 87 | QMAKE_LINK = aCC |
| 88 | QMAKE_LINK_SHLIB= aCC | 88 | QMAKE_LINK_SHLIB= aCC |
| 89 | QMAKE_LFLAGS = +DA2.0W -Wl,+s | 89 | QMAKE_LFLAGS = +DA2.0W -Wl,+s $(LFLAGS_EXTRA) |
| 90 | QMAKE_LFLAGS_RELEASE= -O | 90 | QMAKE_LFLAGS_RELEASE= -O |
| 91 | QMAKE_LFLAGS_DEBUG= -Wl,+tools -g | 91 | QMAKE_LFLAGS_DEBUG= -Wl,+tools -g |
| 92 | QMAKE_LFLAGS_SHLIB= -b | 92 | QMAKE_LFLAGS_SHLIB= -b |
| 93 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 93 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 94 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 94 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 95 | QMAKE_LFLAGS_THREAD= | 95 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf index ba5d122..d7b01b7 100644 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ b/mkspecs/hpux-acc-o64/qmake.conf | |||
| @@ -53,23 +53,23 @@ CONFIG += qt warn_on release | |||
| 53 | 53 | ||
| 54 | QMAKE_CC = cc | 54 | QMAKE_CC = cc |
| 55 | QMAKE_LEX = flex | 55 | QMAKE_LEX = flex |
| 56 | QMAKE_LEXFLAGS = | 56 | QMAKE_LEXFLAGS = |
| 57 | QMAKE_YACC = yacc | 57 | QMAKE_YACC = yacc |
| 58 | QMAKE_YACCFLAGS = -d | 58 | QMAKE_YACCFLAGS = -d |
| 59 | QMAKE_CFLAGS = -Ae +DA2.0 -w | 59 | QMAKE_CFLAGS = -Ae +DA2.0 -w $(CFLAGS_EXTRA) |
| 60 | QMAKE_CFLAGS_WARN_ON= | 60 | QMAKE_CFLAGS_WARN_ON= |
| 61 | QMAKE_CFLAGS_WARN_OFF= | 61 | QMAKE_CFLAGS_WARN_OFF= |
| 62 | QMAKE_CFLAGS_RELEASE= -O +Oentrysched +Onolimit | 62 | QMAKE_CFLAGS_RELEASE= -O +Oentrysched +Onolimit |
| 63 | QMAKE_CFLAGS_DEBUG= -y -g | 63 | QMAKE_CFLAGS_DEBUG= -y -g |
| 64 | QMAKE_CFLAGS_SHLIB= +Z | 64 | QMAKE_CFLAGS_SHLIB= +Z |
| 65 | QMAKE_CFLAGS_YACC= | 65 | QMAKE_CFLAGS_YACC= |
| 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE |
| 67 | 67 | ||
| 68 | QMAKE_CXX = aCC | 68 | QMAKE_CXX = aCC |
| 69 | QMAKE_CXXFLAGS = +DA2.0 -w -D__STRICT_ANSI__ | 69 | QMAKE_CXXFLAGS = +DA2.0 -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) |
| 70 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 70 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 71 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 71 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 72 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 72 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 73 | QMAKE_CXXFLAGS_DEBUG= -g | 73 | QMAKE_CXXFLAGS_DEBUG= -g |
| 74 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 74 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 75 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 75 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -83,13 +83,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 83 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 83 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 84 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | 84 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include |
| 85 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib | 85 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib |
| 86 | 86 | ||
| 87 | QMAKE_LINK = aCC | 87 | QMAKE_LINK = aCC |
| 88 | QMAKE_LINK_SHLIB= aCC | 88 | QMAKE_LINK_SHLIB= aCC |
| 89 | QMAKE_LFLAGS = +DA2.0 -Wl,+s | 89 | QMAKE_LFLAGS = +DA2.0 -Wl,+s $(LFLAGS_EXTRA) |
| 90 | QMAKE_LFLAGS_RELEASE= -O | 90 | QMAKE_LFLAGS_RELEASE= -O |
| 91 | QMAKE_LFLAGS_DEBUG= | 91 | QMAKE_LFLAGS_DEBUG= |
| 92 | QMAKE_LFLAGS_SHLIB= -b | 92 | QMAKE_LFLAGS_SHLIB= -b |
| 93 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 93 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 94 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 94 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 95 | QMAKE_RPATH = -Wl,+b, | 95 | QMAKE_RPATH = -Wl,+b, |
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf index 7218fee..5990aa7 100644 --- a/mkspecs/hpux-acc/qmake.conf +++ b/mkspecs/hpux-acc/qmake.conf | |||
| @@ -32,23 +32,23 @@ CONFIG = qt warn_on release | |||
| 32 | 32 | ||
| 33 | QMAKE_CC = cc | 33 | QMAKE_CC = cc |
| 34 | QMAKE_LEX = flex | 34 | QMAKE_LEX = flex |
| 35 | QMAKE_LEXFLAGS = | 35 | QMAKE_LEXFLAGS = |
| 36 | QMAKE_YACC = yacc | 36 | QMAKE_YACC = yacc |
| 37 | QMAKE_YACCFLAGS = -d | 37 | QMAKE_YACCFLAGS = -d |
| 38 | QMAKE_CFLAGS = -Ae +DAportable -w +Z | 38 | QMAKE_CFLAGS = -Ae +DAportable -w +Z $(CFLAGS_EXTRA) |
| 39 | QMAKE_CFLAGS_WARN_ON= | 39 | QMAKE_CFLAGS_WARN_ON= |
| 40 | QMAKE_CFLAGS_WARN_OFF= | 40 | QMAKE_CFLAGS_WARN_OFF= |
| 41 | QMAKE_CFLAGS_RELEASE= -O | 41 | QMAKE_CFLAGS_RELEASE= -O |
| 42 | QMAKE_CFLAGS_DEBUG= -g | 42 | QMAKE_CFLAGS_DEBUG= -g |
| 43 | QMAKE_CFLAGS_SHLIB= | 43 | QMAKE_CFLAGS_SHLIB= |
| 44 | QMAKE_CFLAGS_YACC= | 44 | QMAKE_CFLAGS_YACC= |
| 45 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | 45 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE |
| 46 | 46 | ||
| 47 | QMAKE_CXX = aCC | 47 | QMAKE_CXX = aCC |
| 48 | QMAKE_CXXFLAGS = +DAportable -w +Z -D__STRICT_ANSI__ | 48 | QMAKE_CXXFLAGS = +DAportable -w +Z -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) |
| 49 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 49 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 50 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 50 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 51 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 51 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 52 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 52 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 53 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 53 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 54 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 54 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -62,13 +62,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 62 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 62 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 63 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | 63 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include |
| 64 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib | 64 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib |
| 65 | 65 | ||
| 66 | QMAKE_LINK = aCC | 66 | QMAKE_LINK = aCC |
| 67 | QMAKE_LINK_SHLIB= aCC | 67 | QMAKE_LINK_SHLIB= aCC |
| 68 | QMAKE_LFLAGS = +DAportable -Wl,+s | 68 | QMAKE_LFLAGS = +DAportable -Wl,+s $(LFLAGS_EXTRA) |
| 69 | QMAKE_LFLAGS_RELEASE= -O | 69 | QMAKE_LFLAGS_RELEASE= -O |
| 70 | QMAKE_LFLAGS_DEBUG= | 70 | QMAKE_LFLAGS_DEBUG= |
| 71 | QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared | 71 | QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared |
| 72 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 72 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 73 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 73 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 74 | QMAKE_LFLAGS_THREAD= | 74 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf index a7f2b65..56e9057 100644 --- a/mkspecs/hpux-cc/qmake.conf +++ b/mkspecs/hpux-cc/qmake.conf | |||
| @@ -33,22 +33,22 @@ CONFIG += qt warn_on release | |||
| 33 | 33 | ||
| 34 | QMAKE_CC = cc | 34 | QMAKE_CC = cc |
| 35 | QMAKE_LEX = flex | 35 | QMAKE_LEX = flex |
| 36 | QMAKE_LEXFLAGS = | 36 | QMAKE_LEXFLAGS = |
| 37 | QMAKE_YACC = yacc | 37 | QMAKE_YACC = yacc |
| 38 | QMAKE_YACCFLAGS = -d | 38 | QMAKE_YACCFLAGS = -d |
| 39 | QMAKE_CFLAGS = -Ae +DA1.1e -w | 39 | QMAKE_CFLAGS = -Ae +DA1.1e -w $(CFLAGS_EXTRA) |
| 40 | QMAKE_CFLAGS_WARN_ON= | 40 | QMAKE_CFLAGS_WARN_ON= |
| 41 | QMAKE_CFLAGS_WARN_OFF= | 41 | QMAKE_CFLAGS_WARN_OFF= |
| 42 | QMAKE_CFLAGS_RELEASE= -O | 42 | QMAKE_CFLAGS_RELEASE= -O |
| 43 | QMAKE_CFLAGS_DEBUG= -g | 43 | QMAKE_CFLAGS_DEBUG= -g |
| 44 | QMAKE_CFLAGS_SHLIB= +Z | 44 | QMAKE_CFLAGS_SHLIB= +Z |
| 45 | QMAKE_CFLAGS_YACC= | 45 | QMAKE_CFLAGS_YACC= |
| 46 | 46 | ||
| 47 | QMAKE_CXX = CC | 47 | QMAKE_CXX = CC |
| 48 | QMAKE_CXXFLAGS = +DA1.1e -w +a1 | 48 | QMAKE_CXXFLAGS = +DA1.1e -w +a1 $(CXXFLAGS_EXTRA) |
| 49 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 49 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 50 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 50 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 51 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 51 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 52 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 52 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 53 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 53 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 54 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 54 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -62,13 +62,13 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib | |||
| 62 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | 62 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include |
| 63 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib | 63 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib |
| 64 | 64 | ||
| 65 | QMAKE_LINK = CC | 65 | QMAKE_LINK = CC |
| 66 | QMAKE_LINK_SHLIB= CC | 66 | QMAKE_LINK_SHLIB= CC |
| 67 | # CC generates template code during linking, and so needs -I's | 67 | # CC generates template code during linking, and so needs -I's |
| 68 | QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT | 68 | QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT $(LFLAGS_EXTRA) |
| 69 | QMAKE_LFLAGS_RELEASE= -O -s | 69 | QMAKE_LFLAGS_RELEASE= -O -s |
| 70 | QMAKE_LFLAGS_DEBUG= | 70 | QMAKE_LFLAGS_DEBUG= |
| 71 | QMAKE_LFLAGS_SHLIB= -b | 71 | QMAKE_LFLAGS_SHLIB= -b |
| 72 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 72 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 73 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 73 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 74 | QMAKE_RPATH = -Wl,+b, | 74 | QMAKE_RPATH = -Wl,+b, |
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf index 0db1650..9ba5359 100644 --- a/mkspecs/hpux-g++/qmake.conf +++ b/mkspecs/hpux-g++/qmake.conf | |||
| @@ -14,24 +14,24 @@ CONFIG += qt warn_on release | |||
| 14 | 14 | ||
| 15 | QMAKE_CC = gcc | 15 | QMAKE_CC = gcc |
| 16 | QMAKE_LEX = flex | 16 | QMAKE_LEX = flex |
| 17 | QMAKE_LEXFLAGS = | 17 | QMAKE_LEXFLAGS = |
| 18 | QMAKE_YACC = yacc | 18 | QMAKE_YACC = yacc |
| 19 | QMAKE_YACCFLAGS = -d | 19 | QMAKE_YACCFLAGS = -d |
| 20 | QMAKE_CFLAGS = | 20 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 21 | QMAKE_CFLAGS_DEPS= -M | 21 | QMAKE_CFLAGS_DEPS= -M |
| 22 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 22 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 23 | QMAKE_CFLAGS_WARN_OFF= -w | 23 | QMAKE_CFLAGS_WARN_OFF= -w |
| 24 | QMAKE_CFLAGS_RELEASE= -O2 | 24 | QMAKE_CFLAGS_RELEASE= -O2 |
| 25 | QMAKE_CFLAGS_DEBUG= -g | 25 | QMAKE_CFLAGS_DEBUG= -g |
| 26 | QMAKE_CFLAGS_SHLIB= -fPIC | 26 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 27 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 27 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 28 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | 28 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE |
| 29 | 29 | ||
| 30 | QMAKE_CXX = g++ | 30 | QMAKE_CXX = g++ |
| 31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 32 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 32 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 33 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 33 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 34 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 34 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 35 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 35 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 36 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 36 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 37 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 37 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -46,13 +46,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 46 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 46 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 47 | QMAKE_INCDIR_OPENGL= /opt/Mesa/include /usr/contrib/X11R6/include | 47 | QMAKE_INCDIR_OPENGL= /opt/Mesa/include /usr/contrib/X11R6/include |
| 48 | QMAKE_LIBDIR_OPENGL= /opt/Mesa/lib /usr/contrib/X11R6/lib | 48 | QMAKE_LIBDIR_OPENGL= /opt/Mesa/lib /usr/contrib/X11R6/lib |
| 49 | 49 | ||
| 50 | QMAKE_LINK = g++ | 50 | QMAKE_LINK = g++ |
| 51 | QMAKE_LINK_SHLIB= g++ | 51 | QMAKE_LINK_SHLIB= g++ |
| 52 | QMAKE_LFLAGS = -Wl,+s | 52 | QMAKE_LFLAGS = -Wl,+s $(LFLAGS_EXTRA) |
| 53 | QMAKE_LFLAGS_RELEASE= | 53 | QMAKE_LFLAGS_RELEASE= |
| 54 | QMAKE_LFLAGS_DEBUG= | 54 | QMAKE_LFLAGS_DEBUG= |
| 55 | QMAKE_LFLAGS_SHLIB= -fPIC -shared | 55 | QMAKE_LFLAGS_SHLIB= -fPIC -shared |
| 56 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 56 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 57 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 57 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 58 | QMAKE_RPATH = -Wl,+b, | 58 | QMAKE_RPATH = -Wl,+b, |
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf index d3a22f6..12d70f7 100644 --- a/mkspecs/hurd-g++/qmake.conf +++ b/mkspecs/hurd-g++/qmake.conf | |||
| @@ -13,23 +13,23 @@ CONFIG += qt warn_on release | |||
| 13 | 13 | ||
| 14 | QMAKE_CC = gcc | 14 | QMAKE_CC = gcc |
| 15 | QMAKE_LEX = flex | 15 | QMAKE_LEX = flex |
| 16 | QMAKE_LEXFLAGS = | 16 | QMAKE_LEXFLAGS = |
| 17 | QMAKE_YACC = yacc | 17 | QMAKE_YACC = yacc |
| 18 | QMAKE_YACCFLAGS = -d | 18 | QMAKE_YACCFLAGS = -d |
| 19 | QMAKE_CFLAGS = | 19 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 20 | QMAKE_CFLAGS_DEPS= -M | 20 | QMAKE_CFLAGS_DEPS= -M |
| 21 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 21 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 22 | QMAKE_CFLAGS_WARN_OFF= -w | 22 | QMAKE_CFLAGS_WARN_OFF= -w |
| 23 | QMAKE_CFLAGS_RELEASE= -O2 | 23 | QMAKE_CFLAGS_RELEASE= -O2 |
| 24 | QMAKE_CFLAGS_DEBUG= -g | 24 | QMAKE_CFLAGS_DEBUG= -g |
| 25 | QMAKE_CFLAGS_SHLIB= -fPIC | 25 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 27 | 27 | ||
| 28 | QMAKE_CXX = g++ | 28 | QMAKE_CXX = g++ |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -43,13 +43,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 46 | ||
| 47 | QMAKE_LINK = g++ | 47 | QMAKE_LINK = g++ |
| 48 | QMAKE_LINK_SHLIB= g++ | 48 | QMAKE_LINK_SHLIB= g++ |
| 49 | QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib | 49 | QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 52 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | 55 | ||
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index f5a127f..0113dac 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf | |||
| @@ -42,24 +42,24 @@ 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 | 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= -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 | 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 |
| @@ -74,13 +74,13 @@ 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 | 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= |
diff --git a/mkspecs/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf index b04ce09..f512ec1 100644 --- a/mkspecs/irix-cc-o32/qmake.conf +++ b/mkspecs/irix-cc-o32/qmake.conf | |||
| @@ -17,23 +17,23 @@ CONFIG += qt warn_on release | |||
| 17 | QMAKE_CC = cc | 17 | QMAKE_CC = cc |
| 18 | QMAKE_LEX = flex | 18 | QMAKE_LEX = flex |
| 19 | QMAKE_LEXFLAGS = | 19 | QMAKE_LEXFLAGS = |
| 20 | QMAKE_YACC = yacc | 20 | QMAKE_YACC = yacc |
| 21 | QMAKE_YACCFLAGS = -d | 21 | QMAKE_YACCFLAGS = -d |
| 22 | QMAKE_CFLAGS_DEPS= -M | 22 | QMAKE_CFLAGS_DEPS= -M |
| 23 | QMAKE_CFLAGS = -o32 -woff 3203,3260,3672 | 23 | QMAKE_CFLAGS = -o32 -woff 3203,3260,3672 $(CFLAGS_EXTRA) |
| 24 | QMAKE_CFLAGS_WARN_ON= -fullwarn | 24 | QMAKE_CFLAGS_WARN_ON= -fullwarn |
| 25 | QMAKE_CFLAGS_WARN_OFF= | 25 | QMAKE_CFLAGS_WARN_OFF= |
| 26 | QMAKE_CFLAGS_RELEASE= -O2 -Olimit 3000 | 26 | QMAKE_CFLAGS_RELEASE= -O2 -Olimit 3000 |
| 27 | QMAKE_CFLAGS_DEBUG= -g | 27 | QMAKE_CFLAGS_DEBUG= -g |
| 28 | QMAKE_CFLAGS_SHLIB= | 28 | QMAKE_CFLAGS_SHLIB= |
| 29 | QMAKE_CFLAGS_YACC= -woff 3203,3262 | 29 | QMAKE_CFLAGS_YACC= -woff 3203,3262 |
| 30 | QMAKE_CFLAGS_THREAD= | 30 | QMAKE_CFLAGS_THREAD= |
| 31 | 31 | ||
| 32 | QMAKE_CXX = CC | 32 | QMAKE_CXX = CC |
| 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 34 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 34 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 35 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 35 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 36 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 36 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 37 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 37 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 38 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 38 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 39 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 39 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -48,13 +48,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 48 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 48 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 49 | QMAKE_INCDIR_OPENGL= | 49 | QMAKE_INCDIR_OPENGL= |
| 50 | QMAKE_LIBDIR_OPENGL= | 50 | QMAKE_LIBDIR_OPENGL= |
| 51 | 51 | ||
| 52 | QMAKE_LINK = CC | 52 | QMAKE_LINK = CC |
| 53 | QMAKE_LINK_SHLIB= CC | 53 | QMAKE_LINK_SHLIB= CC |
| 54 | QMAKE_LFLAGS = -o32 | 54 | QMAKE_LFLAGS = -o32 $(LFLAGS_EXTRA) |
| 55 | QMAKE_LFLAGS_RELEASE= | 55 | QMAKE_LFLAGS_RELEASE= |
| 56 | QMAKE_LFLAGS_DEBUG= | 56 | QMAKE_LFLAGS_DEBUG= |
| 57 | QMAKE_LFLAGS_SHLIB= -shared | 57 | QMAKE_LFLAGS_SHLIB= -shared |
| 58 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 58 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 59 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 59 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 60 | QMAKE_LFLAGS_THREAD= | 60 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf index e483235..2fef9df 100644 --- a/mkspecs/irix-cc/qmake.conf +++ b/mkspecs/irix-cc/qmake.conf | |||
| @@ -42,24 +42,24 @@ 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 = -n32 -woff 1021,1209,1233,1314,1355,1375,1506 | 48 | QMAKE_CFLAGS = -n32 -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= -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 = -n32 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 | 59 | QMAKE_CXXFLAGS = -n32 -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 |
| @@ -74,13 +74,13 @@ 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 = -n32 | 80 | QMAKE_LFLAGS = -n32 $(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= |
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf index 006eccb..7def26a 100644 --- a/mkspecs/irix-g++/qmake.conf +++ b/mkspecs/irix-g++/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= | 24 | QMAKE_CFLAGS_THREAD= |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 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 |
| @@ -42,13 +42,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = | 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= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 54 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf index 6c2407b..28687c3 100644 --- a/mkspecs/linux-cxx/qmake.conf +++ b/mkspecs/linux-cxx/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = ccc | 11 | QMAKE_CC = ccc |
| 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 = -w | 16 | QMAKE_CFLAGS = -w $(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= | 19 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= -Olimit 1000 | 23 | QMAKE_CFLAGS_YACC= -Olimit 1000 |
| 24 | 24 | ||
| 25 | QMAKE_CXX = cxx | 25 | QMAKE_CXX = cxx |
| 26 | QMAKE_CXXFLAGS = -w | 26 | QMAKE_CXXFLAGS = -w $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = cxx | 44 | QMAKE_LINK = cxx |
| 45 | QMAKE_LINK_SHLIB= cxx | 45 | QMAKE_LINK_SHLIB= cxx |
| 46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB= -shared | 49 | QMAKE_LFLAGS_SHLIB= -shared |
| 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | 52 | ||
diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf index 7a267ff..4507b37 100644 --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf | |||
| @@ -11,24 +11,24 @@ QMAKE_INCREMENTAL_STYLE = sublib | |||
| 11 | 11 | ||
| 12 | QMAKE_CC = gcc | 12 | QMAKE_CC = gcc |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = -pipe | 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_DEPS= -M | 18 | QMAKE_CFLAGS_DEPS= -M |
| 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 20 | QMAKE_CFLAGS_WARN_OFF= -w | 20 | QMAKE_CFLAGS_WARN_OFF= -w |
| 21 | QMAKE_CFLAGS_RELEASE= -O2 | 21 | QMAKE_CFLAGS_RELEASE= -O2 |
| 22 | QMAKE_CFLAGS_DEBUG= -g | 22 | QMAKE_CFLAGS_DEBUG= -g |
| 23 | QMAKE_CFLAGS_SHLIB= -fPIC | 23 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 24 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 24 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 25 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 25 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 26 | 26 | ||
| 27 | QMAKE_CXX = g++ | 27 | QMAKE_CXX = g++ |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -43,13 +43,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 46 | ||
| 47 | QMAKE_LINK = g++ | 47 | QMAKE_LINK = g++ |
| 48 | QMAKE_LINK_SHLIB= g++ | 48 | QMAKE_LINK_SHLIB= g++ |
| 49 | QMAKE_LFLAGS = | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 52 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | QMAKE_LFLAGS_THREAD= | 55 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 29ef3e7..cd13562 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf | |||
| @@ -10,24 +10,24 @@ 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 = | 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= -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 | 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 |
| @@ -42,13 +42,13 @@ 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 = | 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= |
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index 20bcd80..17bf26a 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf | |||
| @@ -17,24 +17,24 @@ CONFIG += qt warn_on release | |||
| 17 | 17 | ||
| 18 | QMAKE_CC = KCC | 18 | QMAKE_CC = KCC |
| 19 | QMAKE_LEX = flex | 19 | QMAKE_LEX = flex |
| 20 | QMAKE_LEXFLAGS = | 20 | QMAKE_LEXFLAGS = |
| 21 | QMAKE_YACC = yacc | 21 | QMAKE_YACC = yacc |
| 22 | QMAKE_YACCFLAGS = -d | 22 | QMAKE_YACCFLAGS = -d |
| 23 | QMAKE_CFLAGS = --c --display_error_number --backend -pipe | 23 | QMAKE_CFLAGS = --c --display_error_number --backend -pipe $(CFLAGS_EXTRA) |
| 24 | QMAKE_CFLAGS_DEPS= -M | 24 | QMAKE_CFLAGS_DEPS= -M |
| 25 | QMAKE_CFLAGS_WARN_ON= | 25 | QMAKE_CFLAGS_WARN_ON= |
| 26 | QMAKE_CFLAGS_WARN_OFF= -w | 26 | QMAKE_CFLAGS_WARN_OFF= -w |
| 27 | QMAKE_CFLAGS_RELEASE= +K2 | 27 | QMAKE_CFLAGS_RELEASE= +K2 |
| 28 | QMAKE_CFLAGS_DEBUG= +K0 | 28 | QMAKE_CFLAGS_DEBUG= +K0 |
| 29 | QMAKE_CFLAGS_SHLIB= -fPIC | 29 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 30 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 | 30 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 |
| 31 | QMAKE_CFLAGS_THREAD= --thread_safe | 31 | QMAKE_CFLAGS_THREAD= --thread_safe |
| 32 | 32 | ||
| 33 | QMAKE_CXX = KCC | 33 | QMAKE_CXX = KCC |
| 34 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 --backend -pipe | 34 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 --backend -pipe $(CXXFLAGS_EXTRA) |
| 35 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 35 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 36 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 36 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 37 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 37 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 38 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 38 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 39 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 39 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 40 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 40 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -49,13 +49,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 49 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 49 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 50 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 50 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 51 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 51 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 52 | 52 | ||
| 53 | QMAKE_LINK = KCC | 53 | QMAKE_LINK = KCC |
| 54 | QMAKE_LINK_SHLIB= KCC | 54 | QMAKE_LINK_SHLIB= KCC |
| 55 | QMAKE_LFLAGS = | 55 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 56 | QMAKE_LFLAGS_RELEASE= | 56 | QMAKE_LFLAGS_RELEASE= |
| 57 | QMAKE_LFLAGS_DEBUG= | 57 | QMAKE_LFLAGS_DEBUG= |
| 58 | QMAKE_LFLAGS_SHLIB= | 58 | QMAKE_LFLAGS_SHLIB= |
| 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 60 | QMAKE_LFLAGS_SONAME= --soname$$LITERAL_WHITESPACE | 60 | QMAKE_LFLAGS_SONAME= --soname$$LITERAL_WHITESPACE |
| 61 | QMAKE_LFLAGS_THREAD= --thread_safe | 61 | QMAKE_LFLAGS_THREAD= --thread_safe |
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index 1db6029..ddccc47 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = pgcc | 11 | QMAKE_CC = pgcc |
| 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 = | 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= -fast | 20 | QMAKE_CFLAGS_RELEASE= -fast |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fpic | 22 | QMAKE_CFLAGS_SHLIB= -fpic |
| 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 = pgCC | 26 | QMAKE_CXX = pgCC |
| 27 | QMAKE_CXXFLAGS = --display_error_number $$QMAKE_CFLAGS | 27 | QMAKE_CXXFLAGS = --display_error_number $$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 |
| @@ -42,13 +42,13 @@ 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 = pgCC | 46 | QMAKE_LINK = pgCC |
| 47 | QMAKE_LINK_SHLIB= pgCC | 47 | QMAKE_LINK_SHLIB= pgCC |
| 48 | QMAKE_LFLAGS = | 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= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 54 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 68ec6a1..77c206c 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf | |||
| @@ -12,24 +12,24 @@ QMAKE_INCREMENTAL_STYLE = sublibs | |||
| 12 | QMAKE_CC = $(TB)cc | 12 | QMAKE_CC = $(TB)cc |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_RESOURCE = /Developer/Tools/Rez | 17 | QMAKE_RESOURCE = /Developer/Tools/Rez |
| 18 | QMAKE_CFLAGS = -pipe | 18 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 19 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= -O2 | 22 | QMAKE_CFLAGS_RELEASE= -O2 |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -fPIC | 24 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 25 | QMAKE_EXTENSION_SHLIB= dylib | 25 | QMAKE_EXTENSION_SHLIB= dylib |
| 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 27 | 27 | ||
| 28 | QMAKE_CXX = $(TB)c++ | 28 | QMAKE_CXX = $(TB)c++ |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -41,13 +41,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 42 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ | 42 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ |
| 43 | /System/Library/Frameworks/AGL.framework/Headers/ | 43 | /System/Library/Frameworks/AGL.framework/Headers/ |
| 44 | 44 | ||
| 45 | QMAKE_LINK = $$QMAKE_CXX | 45 | QMAKE_LINK = $$QMAKE_CXX |
| 46 | QMAKE_LINK_SHLIB= $$QMAKE_CXX | 46 | QMAKE_LINK_SHLIB= $$QMAKE_CXX |
| 47 | QMAKE_LFLAGS = | 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 48 | #QMAKE_LFLAGS_PREBIND = -prebind -seg1addr 0x90000000 | 48 | #QMAKE_LFLAGS_PREBIND = -prebind -seg1addr 0x90000000 |
| 49 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHAPP= -prebind | 51 | QMAKE_LFLAGS_SHAPP= -prebind |
| 52 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 52 | QMAKE_LFLAGS_SHLIB= -dynamiclib |
| 53 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace | 53 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace |
diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf index 31c8663..b576719 100755 --- a/mkspecs/macx-pbuilder/qmake.conf +++ b/mkspecs/macx-pbuilder/qmake.conf | |||
| @@ -11,24 +11,24 @@ CONFIG += qt warn_on release lib_version_first incremental resource_fork plugi | |||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 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_RESOURCE = /Developer/Tools/Rez | 16 | QMAKE_RESOURCE = /Developer/Tools/Rez |
| 17 | QMAKE_CFLAGS = -pipe | 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_DEPS= -M | 18 | QMAKE_CFLAGS_DEPS= -M |
| 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 20 | QMAKE_CFLAGS_WARN_OFF= | 20 | QMAKE_CFLAGS_WARN_OFF= |
| 21 | QMAKE_CFLAGS_RELEASE= -O3 | 21 | QMAKE_CFLAGS_RELEASE= -O3 |
| 22 | QMAKE_CFLAGS_DEBUG= -g | 22 | QMAKE_CFLAGS_DEBUG= -g |
| 23 | QMAKE_CFLAGS_SHLIB= -fPIC | 23 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 24 | QMAKE_EXTENSION_SHLIB= dylib | 24 | QMAKE_EXTENSION_SHLIB= dylib |
| 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 26 | 26 | ||
| 27 | QMAKE_CXX = c++ | 27 | QMAKE_CXX = c++ |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -41,13 +41,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 42 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ | 42 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ |
| 43 | /System/Library/Frameworks/AGL.framework/Headers/ | 43 | /System/Library/Frameworks/AGL.framework/Headers/ |
| 44 | 44 | ||
| 45 | QMAKE_LINK = c++ | 45 | QMAKE_LINK = c++ |
| 46 | QMAKE_LINK_SHLIB= c++ | 46 | QMAKE_LINK_SHLIB= c++ |
| 47 | QMAKE_LFLAGS = | 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 48 | QMAKE_LFLAGS_RELEASE= | 48 | QMAKE_LFLAGS_RELEASE= |
| 49 | QMAKE_LFLAGS_DEBUG= | 49 | QMAKE_LFLAGS_DEBUG= |
| 50 | QMAKE_LFLAGS_SHAPP= -prebind | 50 | QMAKE_LFLAGS_SHAPP= -prebind |
| 51 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 51 | QMAKE_LFLAGS_SHLIB= -dynamiclib |
| 52 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace | 52 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace |
| 53 | QMAKE_LFLAGS_PLUGIN= -bundle | 53 | QMAKE_LFLAGS_PLUGIN= -bundle |
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index 5a06456..33264b3 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -pthread | 24 | QMAKE_CFLAGS_THREAD= -pthread |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 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 |
| @@ -43,13 +43,13 @@ 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 = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) | 48 | QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) |
| 49 | QMAKE_LFLAGS = | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 52 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | QMAKE_LFLAGS_THREAD= -pthread | 55 | QMAKE_LFLAGS_THREAD= -pthread |
diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf index 5f75405..ea3bda9 100644 --- a/mkspecs/openbsd-g++/qmake.conf +++ b/mkspecs/openbsd-g++/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -pthread | 24 | QMAKE_CFLAGS_THREAD= -pthread |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 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 |
| @@ -45,13 +45,13 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LINK_SHLIB_CMD= $$QMAKE_LINK_SHLIB $(LFLAGS) \ | 48 | QMAKE_LINK_SHLIB_CMD= $$QMAKE_LINK_SHLIB $(LFLAGS) \ |
| 49 | $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ | 49 | $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ |
| 50 | -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) | 50 | -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) |
| 51 | QMAKE_LFLAGS = | 51 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 52 | QMAKE_LFLAGS_RELEASE= | 52 | QMAKE_LFLAGS_RELEASE= |
| 53 | QMAKE_LFLAGS_DEBUG= | 53 | QMAKE_LFLAGS_DEBUG= |
| 54 | QMAKE_LFLAGS_SHLIB= -shared | 54 | QMAKE_LFLAGS_SHLIB= -shared |
| 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 57 | QMAKE_LFLAGS_THREAD= -pthread | 57 | QMAKE_LFLAGS_THREAD= -pthread |
diff --git a/mkspecs/qnx-g++/qmake.conf b/mkspecs/qnx-g++/qmake.conf index 31afdfa..164dea6 100644 --- a/mkspecs/qnx-g++/qmake.conf +++ b/mkspecs/qnx-g++/qmake.conf | |||
| @@ -12,24 +12,24 @@ CONFIG += qt warn_on release | |||
| 12 | 12 | ||
| 13 | QMAKE_CC = gcc | 13 | QMAKE_CC = gcc |
| 14 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 15 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 16 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 17 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 18 | QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct | 18 | QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct $(CFLAGS_EXTRA) |
| 19 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= -O | 22 | QMAKE_CFLAGS_RELEASE= -O |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -fPIC | 24 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct |
| 26 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 26 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 27 | 27 | ||
| 28 | QMAKE_CXX = g++ | 28 | QMAKE_CXX = g++ |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -44,13 +44,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 45 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 45 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 46 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 46 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 47 | 47 | ||
| 48 | QMAKE_LINK = g++ | 48 | QMAKE_LINK = g++ |
| 49 | QMAKE_LINK_SHLIB= g++ | 49 | QMAKE_LINK_SHLIB= g++ |
| 50 | QMAKE_LFLAGS = | 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 51 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 52 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 53 | QMAKE_LFLAGS_SHLIB= -shared | 53 | QMAKE_LFLAGS_SHLIB= -shared |
| 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 55 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 55 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 56 | QMAKE_LFLAGS_THREAD= | 56 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf index 3588caf..cb551a8 100644 --- a/mkspecs/qws/freebsd-generic-g++/qmake.conf +++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf | |||
| @@ -10,25 +10,25 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 -fno-default-inline | 20 | QMAKE_CFLAGS_RELEASE= -O2 -fno-default-inline |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -pthread -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -pthread -D_THREAD_SAFE |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS | 27 | QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 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 |
| @@ -39,13 +39,13 @@ QMAKE_INCDIR = /usr/local/include | |||
| 39 | QMAKE_LIBDIR = /usr/local/lib | 39 | QMAKE_LIBDIR = /usr/local/lib |
| 40 | QMAKE_INCDIR_QT = $(QTDIR)/include | 40 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 42 | 42 | ||
| 43 | QMAKE_LINK = g++ | 43 | QMAKE_LINK = g++ |
| 44 | QMAKE_LINK_SHLIB= g++ | 44 | QMAKE_LINK_SHLIB= g++ |
| 45 | QMAKE_LFLAGS = | 45 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 46 | QMAKE_LFLAGS_RELEASE= | 46 | QMAKE_LFLAGS_RELEASE= |
| 47 | QMAKE_LFLAGS_DEBUG= | 47 | QMAKE_LFLAGS_DEBUG= |
| 48 | QMAKE_LFLAGS_SHLIB = -shared | 48 | QMAKE_LFLAGS_SHLIB = -shared |
| 49 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 49 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 50 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 50 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 51 | QMAKE_LFLAGS_THREAD = -pthread | 51 | QMAKE_LFLAGS_THREAD = -pthread |
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf index 7927ac5..30c58d3 100644 --- a/mkspecs/qws/linux-arm-g++/qmake.conf +++ b/mkspecs/qws/linux-arm-g++/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= -O2 | 19 | QMAKE_CFLAGS_RELEASE= -O2 |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = arm-linux-g++ | 25 | QMAKE_CXX = arm-linux-g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = arm-linux-g++ | 44 | QMAKE_LINK = arm-linux-g++ |
| 45 | QMAKE_LINK_SHLIB= arm-linux-g++ | 45 | QMAKE_LINK_SHLIB= arm-linux-g++ |
| 46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index 69b14dc..135c6f9 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= -O2 | 19 | QMAKE_CFLAGS_RELEASE= -O2 |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = g++ | 25 | QMAKE_CXX = g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = g++ | 44 | QMAKE_LINK = g++ |
| 45 | QMAKE_LINK_SHLIB= g++ | 45 | QMAKE_LINK_SHLIB= g++ |
| 46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf index ac27d2a..7e4cbf5 100644 --- a/mkspecs/qws/linux-ipaq-g++/qmake.conf +++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= -O2 | 19 | QMAKE_CFLAGS_RELEASE= -O2 |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_IPAQ | 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_IPAQ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = arm-linux-g++ | 44 | QMAKE_LINK = arm-linux-g++ |
| 45 | QMAKE_LINK_SHLIB= arm-linux-g++ | 45 | QMAKE_LINK_SHLIB= arm-linux-g++ |
| 46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
diff --git a/mkspecs/qws/linux-mips-g++/qmake.conf b/mkspecs/qws/linux-mips-g++/qmake.conf index a748f52..55547dd 100644 --- a/mkspecs/qws/linux-mips-g++/qmake.conf +++ b/mkspecs/qws/linux-mips-g++/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = mipsel-linux-gcc | 11 | QMAKE_CC = mipsel-linux-gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= -O2 | 19 | QMAKE_CFLAGS_RELEASE= -O2 |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = mipsel-linux-g++ | 25 | QMAKE_CXX = mipsel-linux-g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = mipsel-linux-g++ | 44 | QMAKE_LINK = mipsel-linux-g++ |
| 45 | QMAKE_LINK_SHLIB= mipsel-linux-g++ | 45 | QMAKE_LINK_SHLIB= mipsel-linux-g++ |
| 46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf index 4744fee..11405c4 100644 --- a/mkspecs/qws/linux-sharp-g++/qmake.conf +++ b/mkspecs/qws/linux-sharp-g++/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= -O2 | 19 | QMAKE_CFLAGS_RELEASE= -O2 |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_SHARP -DQT_QWS_EBX | 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_SHARP -DQT_QWS_EBX |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = arm-linux-g++ | 44 | QMAKE_LINK = arm-linux-g++ |
| 45 | QMAKE_LINK_SHLIB= arm-linux-g++ | 45 | QMAKE_LINK_SHLIB= arm-linux-g++ |
| 46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
diff --git a/mkspecs/qws/linux-x86-g++/qmake.conf b/mkspecs/qws/linux-x86-g++/qmake.conf index e9e4352..e5ac6d1 100644 --- a/mkspecs/qws/linux-x86-g++/qmake.conf +++ b/mkspecs/qws/linux-x86-g++/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= -O2 | 19 | QMAKE_CFLAGS_RELEASE= -O2 |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = g++ | 25 | QMAKE_CXX = g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = g++ | 44 | QMAKE_LINK = g++ |
| 45 | QMAKE_LINK_SHLIB= g++ | 45 | QMAKE_LINK_SHLIB= g++ |
| 46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index d361bdc..e718d2b 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf | |||
| @@ -11,23 +11,23 @@ QMAKE_EXTENSION_SHLIB = dylib | |||
| 11 | 11 | ||
| 12 | QMAKE_CC = $(TB)cc | 12 | QMAKE_CC = $(TB)cc |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = -pipe | 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= | 19 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 -fno-default-inline | 20 | QMAKE_CFLAGS_RELEASE= -O2 -fno-default-inline |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 25 | 25 | ||
| 26 | QMAKE_CXX = $(TB)c++ | 26 | QMAKE_CXX = $(TB)c++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -41,13 +41,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 42 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 42 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 43 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 43 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 44 | 44 | ||
| 45 | QMAKE_LINK = $$QMAKE_CXX | 45 | QMAKE_LINK = $$QMAKE_CXX |
| 46 | QMAKE_LINK_SHLIB= $$QMAKE_CXX | 46 | QMAKE_LINK_SHLIB= $$QMAKE_CXX |
| 47 | QMAKE_LFLAGS = | 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 48 | QMAKE_LFLAGS_RELEASE= | 48 | QMAKE_LFLAGS_RELEASE= |
| 49 | QMAKE_LFLAGS_DEBUG= | 49 | QMAKE_LFLAGS_DEBUG= |
| 50 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 50 | QMAKE_LFLAGS_SHLIB= -dynamiclib |
| 51 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace | 51 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace |
| 52 | QMAKE_LFLAGS_PLUGIN= -bundle | 52 | QMAKE_LFLAGS_PLUGIN= -bundle |
| 53 | QMAKE_LFLAGS_SONAME= | 53 | QMAKE_LFLAGS_SONAME= |
diff --git a/mkspecs/qws/qnx4-cc/qmake.conf b/mkspecs/qws/qnx4-cc/qmake.conf index a756b60..1020a3e 100644 --- a/mkspecs/qws/qnx4-cc/qmake.conf +++ b/mkspecs/qws/qnx4-cc/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release no_mocdepend | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 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 = -WC,-sg | 16 | QMAKE_CFLAGS = -WC,-sg $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON = -w1 | 17 | QMAKE_CFLAGS_WARN_ON = -w1 |
| 18 | QMAKE_CFLAGS_WARN_OFF = -w0 | 18 | QMAKE_CFLAGS_WARN_OFF = -w0 |
| 19 | QMAKE_CFLAGS_RELEASE = -O | 19 | QMAKE_CFLAGS_RELEASE = -O |
| 20 | QMAKE_CFLAGS_DEBUG= -g2d | 20 | QMAKE_CFLAGS_DEBUG= -g2d |
| 21 | QMAKE_CFLAGS_SHLIB= | 21 | QMAKE_CFLAGS_SHLIB= |
| 22 | QMAKE_CFLAGS_YACC= | 22 | QMAKE_CFLAGS_YACC= |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT -WC,-bm | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT -WC,-bm |
| 24 | 24 | ||
| 25 | QMAKE_CXX = cc | 25 | QMAKE_CXX = cc |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS $(CXXFLAGS_EXTRA) |
| 27 | DEFINES += QT_NO_SOUND QT_CLEAN_NAMESPACE QT_NO_QWS_TRANSFORMED QT_NO_QWS_MOUSE_AUTO QT_NO_QWS_MOUSE_MANUAL QT_NO_QWS_LINUXFB | 27 | DEFINES += QT_NO_SOUND QT_CLEAN_NAMESPACE QT_NO_QWS_TRANSFORMED QT_NO_QWS_MOUSE_AUTO QT_NO_QWS_MOUSE_MANUAL QT_NO_QWS_LINUXFB |
| 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -37,13 +37,13 @@ QMAKE_INCDIR = /usr/local/include /usr/include/graphics | |||
| 37 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib | 37 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib |
| 38 | QMAKE_INCDIR_QT = $(QTDIR)/include | 38 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 39 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 39 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 40 | 40 | ||
| 41 | QMAKE_LINK = cc | 41 | QMAKE_LINK = cc |
| 42 | QMAKE_LINK_SHLIB= cc | 42 | QMAKE_LINK_SHLIB= cc |
| 43 | QMAKE_LFLAGS = -lsocket | 43 | QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA) |
| 44 | QMAKE_LFLAGS_RELEASE= | 44 | QMAKE_LFLAGS_RELEASE= |
| 45 | QMAKE_LFLAGS_DEBUG= -g2d | 45 | QMAKE_LFLAGS_DEBUG= -g2d |
| 46 | QMAKE_LFLAGS_SHLIB= -d | 46 | QMAKE_LFLAGS_SHLIB= -d |
| 47 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 47 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 48 | QMAKE_LFLAGS_SONAME= | 48 | QMAKE_LFLAGS_SONAME= |
| 49 | QMAKE_LFLAGS_THREAD= | 49 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf index b0bacf0..ef69f21 100644 --- a/mkspecs/qws/qnx6-generic-cc/qmake.conf +++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 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 = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED | 16 | QMAKE_CFLAGS = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall | 17 | QMAKE_CFLAGS_WARN_ON= -Wall |
| 18 | QMAKE_CFLAGS_WARN_OFF= -w | 18 | QMAKE_CFLAGS_WARN_OFF= -w |
| 19 | QMAKE_CFLAGS_RELEASE= -O | 19 | QMAKE_CFLAGS_RELEASE= -O |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= | 21 | QMAKE_CFLAGS_SHLIB= |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = cc | 25 | QMAKE_CXX = cc |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_MULTIPROCESS | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_MULTIPROCESS $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = cc | 44 | QMAKE_LINK = cc |
| 45 | QMAKE_LINK_SHLIB= cc | 45 | QMAKE_LINK_SHLIB= cc |
| 46 | QMAKE_LFLAGS = -lsocket -ldisputil | 46 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB= -shared | 49 | QMAKE_LFLAGS_SHLIB= -shared |
| 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD= | 52 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/qws/qnx6-generic-g++/qmake.conf b/mkspecs/qws/qnx6-generic-g++/qmake.conf index 065a9fa..df3c836 100644 --- a/mkspecs/qws/qnx6-generic-g++/qmake.conf +++ b/mkspecs/qws/qnx6-generic-g++/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 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 = -pipe -fno-inline -fno-pack-struct -fhonor-std -fexceptions -D_STRINGS_H_INCLUDED | 16 | QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct -fhonor-std -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall | 17 | QMAKE_CFLAGS_WARN_ON= -Wall |
| 18 | QMAKE_CFLAGS_WARN_OFF= -w | 18 | QMAKE_CFLAGS_WARN_OFF= -w |
| 19 | QMAKE_CFLAGS_RELEASE= -O | 19 | QMAKE_CFLAGS_RELEASE= -O |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = cc | 25 | QMAKE_CXX = cc |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_QWS_MULTIPROCESS -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_PROCESS -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_QWS_MULTIPROCESS -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_PROCESS -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = cc -fhonor-std | 44 | QMAKE_LINK = cc -fhonor-std |
| 45 | QMAKE_LINK_SHLIB= cc -fhonor-std | 45 | QMAKE_LINK_SHLIB= cc -fhonor-std |
| 46 | QMAKE_LFLAGS = -lsocket -ldisputil | 46 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB= -shared | 49 | QMAKE_LFLAGS_SHLIB= -shared |
| 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD= | 52 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf index d9e0866..d6048bb 100644 --- a/mkspecs/qws/solaris-generic-g++/qmake.conf +++ b/mkspecs/qws/solaris-generic-g++/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = -pipe | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= -O2 -fno-default-inline | 19 | QMAKE_CFLAGS_RELEASE= -O2 -fno-default-inline |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = g++ | 25 | QMAKE_CXX = g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_SOUND -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_SOUND -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = g++ | 44 | QMAKE_LINK = g++ |
| 45 | QMAKE_LINK_SHLIB= g++ | 45 | QMAKE_LINK_SHLIB= g++ |
| 46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB= -shared | 49 | QMAKE_LFLAGS_SHLIB= -shared |
| 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD= | 52 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf index 1cc3088..fc7a3cf 100644 --- a/mkspecs/reliant-cds-64/qmake.conf +++ b/mkspecs/reliant-cds-64/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 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 = -Klp64 | 16 | QMAKE_CFLAGS = -Klp64 $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -v | 18 | QMAKE_CFLAGS_WARN_ON= -v |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O | 20 | QMAKE_CFLAGS_RELEASE= -O |
| 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= -K pthread | 24 | QMAKE_CFLAGS_THREAD= -K pthread |
| 25 | 25 | ||
| 26 | QMAKE_CXX = CC | 26 | QMAKE_CXX = CC |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 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 |
| @@ -42,13 +42,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = CC | 46 | QMAKE_LINK = CC |
| 47 | QMAKE_LINK_SHLIB= CC | 47 | QMAKE_LINK_SHLIB= CC |
| 48 | QMAKE_LFLAGS = -Klp64 | 48 | QMAKE_LFLAGS = -Klp64 $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -G | 51 | QMAKE_LFLAGS_SHLIB= -G |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 53 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 54 | QMAKE_LFLAGS_THREAD= -K pthread | 54 | QMAKE_LFLAGS_THREAD= -K pthread |
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf index 7bd074f..faaa26d 100644 --- a/mkspecs/reliant-cds/qmake.conf +++ b/mkspecs/reliant-cds/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 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 = | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -v | 18 | QMAKE_CFLAGS_WARN_ON= -v |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O | 20 | QMAKE_CFLAGS_RELEASE= -O |
| 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= -K pthread | 24 | QMAKE_CFLAGS_THREAD= -K pthread |
| 25 | 25 | ||
| 26 | QMAKE_CXX = CC | 26 | QMAKE_CXX = CC |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 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 |
| @@ -42,13 +42,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = CC | 46 | QMAKE_LINK = CC |
| 47 | QMAKE_LINK_SHLIB= CC | 47 | QMAKE_LINK_SHLIB= CC |
| 48 | QMAKE_LFLAGS = | 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= -G | 51 | QMAKE_LFLAGS_SHLIB= -G |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 53 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 54 | QMAKE_LFLAGS_THREAD= -K pthread | 54 | QMAKE_LFLAGS_THREAD= -K pthread |
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf index 43388f0..54bcbfa 100644 --- a/mkspecs/sco-cc/qmake.conf +++ b/mkspecs/sco-cc/qmake.conf | |||
| @@ -13,23 +13,23 @@ CONFIG += qt warn_on release | |||
| 13 | 13 | ||
| 14 | QMAKE_CC = cc | 14 | QMAKE_CC = cc |
| 15 | QMAKE_LEX = flex | 15 | QMAKE_LEX = flex |
| 16 | QMAKE_LEXFLAGS = | 16 | QMAKE_LEXFLAGS = |
| 17 | QMAKE_YACC = yacc | 17 | QMAKE_YACC = yacc |
| 18 | QMAKE_YACCFLAGS = -d | 18 | QMAKE_YACCFLAGS = -d |
| 19 | QMAKE_CFLAGS = | 19 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 20 | QMAKE_CFLAGS_WARN_ON= | 20 | QMAKE_CFLAGS_WARN_ON= |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= -O | 22 | QMAKE_CFLAGS_RELEASE= -O |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -KPIC | 24 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 25 | QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177 | 25 | QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177 |
| 26 | QMAKE_CFLAGS_THREAD= -Kthread | 26 | QMAKE_CFLAGS_THREAD= -Kthread |
| 27 | 27 | ||
| 28 | QMAKE_CXX = CC | 28 | QMAKE_CXX = CC |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -43,13 +43,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= | 44 | QMAKE_INCDIR_OPENGL= |
| 45 | QMAKE_LIBDIR_OPENGL= | 45 | QMAKE_LIBDIR_OPENGL= |
| 46 | 46 | ||
| 47 | QMAKE_LINK = CC | 47 | QMAKE_LINK = CC |
| 48 | QMAKE_LINK_SHLIB= CC | 48 | QMAKE_LINK_SHLIB= CC |
| 49 | QMAKE_LFLAGS = | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -G | 52 | QMAKE_LFLAGS_SHLIB= -G |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 55 | QMAKE_LFLAGS_THREAD= -Kthread | 55 | QMAKE_LFLAGS_THREAD= -Kthread |
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf index 8a4fb62..1c1e3c8 100644 --- a/mkspecs/sco-g++/qmake.conf +++ b/mkspecs/sco-g++/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 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 |
| @@ -42,13 +42,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = | 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= -G | 51 | QMAKE_LFLAGS_SHLIB= -G |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 53 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 54 | QMAKE_RPATH = | 54 | QMAKE_RPATH = |
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index 17b26b0..33fda82 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf | |||
| @@ -28,24 +28,24 @@ CONFIG += qt warn_on release | |||
| 28 | 28 | ||
| 29 | QMAKE_CC = cc | 29 | QMAKE_CC = cc |
| 30 | QMAKE_LEX = flex | 30 | QMAKE_LEX = flex |
| 31 | QMAKE_LEXFLAGS = | 31 | QMAKE_LEXFLAGS = |
| 32 | QMAKE_YACC = yacc | 32 | QMAKE_YACC = yacc |
| 33 | QMAKE_YACCFLAGS = -d | 33 | QMAKE_YACCFLAGS = -d |
| 34 | QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ | 34 | QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA) |
| 35 | QMAKE_CFLAGS_DEPS= -xM | 35 | QMAKE_CFLAGS_DEPS= -xM |
| 36 | QMAKE_CFLAGS_WARN_ON= | 36 | QMAKE_CFLAGS_WARN_ON= |
| 37 | QMAKE_CFLAGS_WARN_OFF= -w | 37 | QMAKE_CFLAGS_WARN_OFF= -w |
| 38 | QMAKE_CFLAGS_RELEASE= -O | 38 | QMAKE_CFLAGS_RELEASE= -O |
| 39 | QMAKE_CFLAGS_DEBUG= -g | 39 | QMAKE_CFLAGS_DEBUG= -g |
| 40 | QMAKE_CFLAGS_SHLIB= -KPIC | 40 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 41 | QMAKE_CFLAGS_YACC= | 41 | QMAKE_CFLAGS_YACC= |
| 42 | QMAKE_CFLAGS_THREAD= -mt | 42 | QMAKE_CFLAGS_THREAD= -mt |
| 43 | 43 | ||
| 44 | QMAKE_CXX = CC | 44 | QMAKE_CXX = CC |
| 45 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 45 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 46 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 46 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 47 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 47 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 48 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 48 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 49 | QMAKE_CXXFLAGS_RELEASE= -O2 | 49 | QMAKE_CXXFLAGS_RELEASE= -O2 |
| 50 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 50 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 51 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 51 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -60,13 +60,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 60 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 60 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 61 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 61 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 62 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 62 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib |
| 63 | 63 | ||
| 64 | QMAKE_LINK = CC | 64 | QMAKE_LINK = CC |
| 65 | QMAKE_LINK_SHLIB= CC | 65 | QMAKE_LINK_SHLIB= CC |
| 66 | QMAKE_LFLAGS = -xarch=v9 | 66 | QMAKE_LFLAGS = -xarch=v9 $(LFLAGS_EXTRA) |
| 67 | QMAKE_LFLAGS_RELEASE= | 67 | QMAKE_LFLAGS_RELEASE= |
| 68 | QMAKE_LFLAGS_DEBUG= | 68 | QMAKE_LFLAGS_DEBUG= |
| 69 | QMAKE_LFLAGS_SHLIB= -G | 69 | QMAKE_LFLAGS_SHLIB= -G |
| 70 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 70 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 71 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 71 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 72 | QMAKE_LFLAGS_THREAD= -mt | 72 | QMAKE_LFLAGS_THREAD= -mt |
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index 0aa1097..3d50180 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf | |||
| @@ -11,24 +11,24 @@ CONFIG += qt warn_on release | |||
| 11 | 11 | ||
| 12 | QMAKE_CC = cc | 12 | QMAKE_CC = cc |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = | 17 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_DEPS= -xM | 18 | QMAKE_CFLAGS_DEPS= -xM |
| 19 | QMAKE_CFLAGS_WARN_ON= | 19 | QMAKE_CFLAGS_WARN_ON= |
| 20 | QMAKE_CFLAGS_WARN_OFF= -w | 20 | QMAKE_CFLAGS_WARN_OFF= -w |
| 21 | QMAKE_CFLAGS_RELEASE= -O | 21 | QMAKE_CFLAGS_RELEASE= -O |
| 22 | QMAKE_CFLAGS_DEBUG= -g | 22 | QMAKE_CFLAGS_DEBUG= -g |
| 23 | QMAKE_CFLAGS_SHLIB= -KPIC | 23 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 24 | QMAKE_CFLAGS_YACC= | 24 | QMAKE_CFLAGS_YACC= |
| 25 | QMAKE_CFLAGS_THREAD= -mt | 25 | QMAKE_CFLAGS_THREAD= -mt |
| 26 | 26 | ||
| 27 | QMAKE_CXX = CC | 27 | QMAKE_CXX = CC |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= -O2 | 32 | QMAKE_CXXFLAGS_RELEASE= -O2 |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -43,13 +43,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 44 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 45 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib |
| 46 | 46 | ||
| 47 | QMAKE_LINK = CC | 47 | QMAKE_LINK = CC |
| 48 | QMAKE_LINK_SHLIB= CC | 48 | QMAKE_LINK_SHLIB= CC |
| 49 | QMAKE_LFLAGS = -R$(QTDIR)/lib | 49 | QMAKE_LFLAGS = -R$(QTDIR)/lib $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -G | 52 | QMAKE_LFLAGS_SHLIB= -G |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 55 | QMAKE_LFLAGS_THREAD= -mt | 55 | QMAKE_LFLAGS_THREAD= -mt |
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index 05853ad..622644b 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf | |||
| @@ -33,24 +33,24 @@ CONFIG += qt warn_on release | |||
| 33 | 33 | ||
| 34 | QMAKE_CC = gcc | 34 | QMAKE_CC = gcc |
| 35 | QMAKE_LEX = flex | 35 | QMAKE_LEX = flex |
| 36 | QMAKE_LEXFLAGS = | 36 | QMAKE_LEXFLAGS = |
| 37 | QMAKE_YACC = yacc | 37 | QMAKE_YACC = yacc |
| 38 | QMAKE_YACCFLAGS = -d | 38 | QMAKE_YACCFLAGS = -d |
| 39 | QMAKE_CFLAGS = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ | 39 | QMAKE_CFLAGS = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA) |
| 40 | QMAKE_CFLAGS_DEPS= -M | 40 | QMAKE_CFLAGS_DEPS= -M |
| 41 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 41 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 42 | QMAKE_CFLAGS_WARN_OFF= -w | 42 | QMAKE_CFLAGS_WARN_OFF= -w |
| 43 | QMAKE_CFLAGS_RELEASE= -O2 | 43 | QMAKE_CFLAGS_RELEASE= -O2 |
| 44 | QMAKE_CFLAGS_DEBUG= -g | 44 | QMAKE_CFLAGS_DEBUG= -g |
| 45 | QMAKE_CFLAGS_SHLIB= -fPIC | 45 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 46 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 46 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 47 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 47 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 48 | 48 | ||
| 49 | QMAKE_CXX = g++ | 49 | QMAKE_CXX = g++ |
| 50 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 50 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 51 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 51 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 52 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 52 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 53 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 53 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 54 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 54 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 55 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 55 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 56 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 56 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -65,13 +65,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 65 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 65 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 66 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 66 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 67 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 67 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib |
| 68 | 68 | ||
| 69 | QMAKE_LINK = g++ | 69 | QMAKE_LINK = g++ |
| 70 | QMAKE_LINK_SHLIB= g++ | 70 | QMAKE_LINK_SHLIB= g++ |
| 71 | QMAKE_LFLAGS = -m64 | 71 | QMAKE_LFLAGS = -m64 $(LFLAGS_EXTRA) |
| 72 | QMAKE_LFLAGS_RELEASE= | 72 | QMAKE_LFLAGS_RELEASE= |
| 73 | QMAKE_LFLAGS_DEBUG= -g | 73 | QMAKE_LFLAGS_DEBUG= -g |
| 74 | QMAKE_LFLAGS_SHLIB= -shared | 74 | QMAKE_LFLAGS_SHLIB= -shared |
| 75 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 75 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 76 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 76 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 77 | QMAKE_LFLAGS_THREAD= | 77 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index c2b4709..71f4307 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf | |||
| @@ -16,24 +16,24 @@ CONFIG += qt warn_on release | |||
| 16 | 16 | ||
| 17 | QMAKE_CC = gcc | 17 | QMAKE_CC = gcc |
| 18 | QMAKE_LEX = flex | 18 | QMAKE_LEX = flex |
| 19 | QMAKE_LEXFLAGS = | 19 | QMAKE_LEXFLAGS = |
| 20 | QMAKE_YACC = yacc | 20 | QMAKE_YACC = yacc |
| 21 | QMAKE_YACCFLAGS = -d | 21 | QMAKE_YACCFLAGS = -d |
| 22 | QMAKE_CFLAGS = | 22 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 23 | QMAKE_CFLAGS_DEPS= -M | 23 | QMAKE_CFLAGS_DEPS= -M |
| 24 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 24 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 25 | QMAKE_CFLAGS_WARN_OFF= -w | 25 | QMAKE_CFLAGS_WARN_OFF= -w |
| 26 | QMAKE_CFLAGS_RELEASE= -O2 | 26 | QMAKE_CFLAGS_RELEASE= -O2 |
| 27 | QMAKE_CFLAGS_DEBUG= -g | 27 | QMAKE_CFLAGS_DEBUG= -g |
| 28 | QMAKE_CFLAGS_SHLIB= -fPIC | 28 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 30 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 30 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 31 | 31 | ||
| 32 | QMAKE_CXX = g++ | 32 | QMAKE_CXX = g++ |
| 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 34 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 34 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 35 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 35 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 36 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 36 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 37 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 37 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 38 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 38 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 39 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 39 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -48,13 +48,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 48 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 48 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 49 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 49 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 50 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 50 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib |
| 51 | 51 | ||
| 52 | QMAKE_LINK = g++ | 52 | QMAKE_LINK = g++ |
| 53 | QMAKE_LINK_SHLIB= g++ | 53 | QMAKE_LINK_SHLIB= g++ |
| 54 | QMAKE_LFLAGS = | 54 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 55 | QMAKE_LFLAGS_RELEASE= | 55 | QMAKE_LFLAGS_RELEASE= |
| 56 | QMAKE_LFLAGS_DEBUG= -g | 56 | QMAKE_LFLAGS_DEBUG= -g |
| 57 | QMAKE_LFLAGS_SHLIB= -shared | 57 | QMAKE_LFLAGS_SHLIB= -shared |
| 58 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 58 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 59 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 59 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 60 | QMAKE_LFLAGS_THREAD= | 60 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/solaris-kcc/qmake.conf b/mkspecs/solaris-kcc/qmake.conf index 274f815..e1c3052 100644 --- a/mkspecs/solaris-kcc/qmake.conf +++ b/mkspecs/solaris-kcc/qmake.conf | |||
| @@ -21,24 +21,24 @@ CONFIG += qt warn_on release | |||
| 21 | 21 | ||
| 22 | QMAKE_CC = KCC | 22 | QMAKE_CC = KCC |
| 23 | QMAKE_LEX = flex | 23 | QMAKE_LEX = flex |
| 24 | QMAKE_LEXFLAGS = | 24 | QMAKE_LEXFLAGS = |
| 25 | QMAKE_YACC = yacc | 25 | QMAKE_YACC = yacc |
| 26 | QMAKE_YACCFLAGS = -d | 26 | QMAKE_YACCFLAGS = -d |
| 27 | QMAKE_CFLAGS = --c --display_error_number | 27 | QMAKE_CFLAGS = --c --display_error_number $(CFLAGS_EXTRA) |
| 28 | QMAKE_CFLAGS_DEPS= -M | 28 | QMAKE_CFLAGS_DEPS= -M |
| 29 | QMAKE_CFLAGS_WARN_ON= | 29 | QMAKE_CFLAGS_WARN_ON= |
| 30 | QMAKE_CFLAGS_WARN_OFF= -w | 30 | QMAKE_CFLAGS_WARN_OFF= -w |
| 31 | QMAKE_CFLAGS_RELEASE= +K2 | 31 | QMAKE_CFLAGS_RELEASE= +K2 |
| 32 | QMAKE_CFLAGS_DEBUG= +K0 | 32 | QMAKE_CFLAGS_DEBUG= +K0 |
| 33 | QMAKE_CFLAGS_SHLIB= -KPIC | 33 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 34 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 | 34 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 |
| 35 | QMAKE_CFLAGS_THREAD= -mt | 35 | QMAKE_CFLAGS_THREAD= -mt |
| 36 | 36 | ||
| 37 | QMAKE_CXX = KCC | 37 | QMAKE_CXX = KCC |
| 38 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 | 38 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA) |
| 39 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 39 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 40 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 40 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 41 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 41 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 42 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 42 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 43 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 43 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 44 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 44 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -53,13 +53,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 53 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 53 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 54 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 54 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 55 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 55 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib |
| 56 | 56 | ||
| 57 | QMAKE_LINK = KCC | 57 | QMAKE_LINK = KCC |
| 58 | QMAKE_LINK_SHLIB= KCC | 58 | QMAKE_LINK_SHLIB= KCC |
| 59 | QMAKE_LFLAGS = | 59 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 60 | QMAKE_LFLAGS_RELEASE= | 60 | QMAKE_LFLAGS_RELEASE= |
| 61 | QMAKE_LFLAGS_DEBUG= | 61 | QMAKE_LFLAGS_DEBUG= |
| 62 | QMAKE_LFLAGS_SHLIB= | 62 | QMAKE_LFLAGS_SHLIB= |
| 63 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 63 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 64 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 64 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 65 | QMAKE_LFLAGS_THREAD= -mt | 65 | QMAKE_LFLAGS_THREAD= -mt |
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf index f699d7b..41279b4 100644 --- a/mkspecs/tru64-cxx/qmake.conf +++ b/mkspecs/tru64-cxx/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = cxx | 11 | QMAKE_CC = cxx |
| 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 = | 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= | 19 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= -Olimit 1000 | 23 | QMAKE_CFLAGS_YACC= -Olimit 1000 |
| 24 | QMAKE_CFLAGS_THREAD= -pthread | 24 | QMAKE_CFLAGS_THREAD= -pthread |
| 25 | 25 | ||
| 26 | QMAKE_CXX = cxx | 26 | QMAKE_CXX = cxx |
| 27 | QMAKE_CXXFLAGS = -x cxx $$QMAKE_CFLAGS | 27 | QMAKE_CXXFLAGS = -x cxx $$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 |
| @@ -42,13 +42,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = cxx | 46 | QMAKE_LINK = cxx |
| 47 | QMAKE_LINK_SHLIB= cxx | 47 | QMAKE_LINK_SHLIB= cxx |
| 48 | QMAKE_LFLAGS = | 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_THREAD= -pthread | 53 | QMAKE_LFLAGS_THREAD= -pthread |
| 54 | QMAKE_LFLAGS_SONAME= -soname$$LITERAL_WHITESPACE | 54 | QMAKE_LFLAGS_SONAME= -soname$$LITERAL_WHITESPACE |
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf index 94ff4a8..ad2c06e 100644 --- a/mkspecs/tru64-g++/qmake.conf +++ b/mkspecs/tru64-g++/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 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 |
| @@ -42,13 +42,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = | 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_THREAD= | 53 | QMAKE_LFLAGS_THREAD= |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
diff --git a/mkspecs/ultrix-g++/qmake.conf b/mkspecs/ultrix-g++/qmake.conf index 482f069..2b847cb 100644 --- a/mkspecs/ultrix-g++/qmake.conf +++ b/mkspecs/ultrix-g++/qmake.conf | |||
| @@ -10,23 +10,23 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | 24 | ||
| 25 | QMAKE_CXX = g++ | 25 | QMAKE_CXX = g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| @@ -40,13 +40,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = g++ | 44 | QMAKE_LINK = g++ |
| 45 | #QMAKE_LINK_SHLIB= g++ | 45 | #QMAKE_LINK_SHLIB= g++ |
| 46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | #QMAKE_LFLAGS_SHLIB= -shared | 49 | #QMAKE_LFLAGS_SHLIB= -shared |
| 50 | #QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 50 | #QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | #QMAKE_LFLAGS_SONAME= -Wl,-soname, | 51 | #QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | 52 | ||
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf index 1e7821a..46b4657 100644 --- a/mkspecs/unixware-cc/qmake.conf +++ b/mkspecs/unixware-cc/qmake.conf | |||
| @@ -13,23 +13,23 @@ CONFIG += qt warn_on release | |||
| 13 | 13 | ||
| 14 | QMAKE_CC = cc | 14 | QMAKE_CC = cc |
| 15 | QMAKE_LEX = flex | 15 | QMAKE_LEX = flex |
| 16 | QMAKE_LEXFLAGS = | 16 | QMAKE_LEXFLAGS = |
| 17 | QMAKE_YACC = yacc | 17 | QMAKE_YACC = yacc |
| 18 | QMAKE_YACCFLAGS = -d | 18 | QMAKE_YACCFLAGS = -d |
| 19 | QMAKE_CFLAGS = | 19 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 20 | QMAKE_CFLAGS_WARN_ON= | 20 | QMAKE_CFLAGS_WARN_ON= |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= -O | 22 | QMAKE_CFLAGS_RELEASE= -O |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -KPIC | 24 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 25 | QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177 | 25 | QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177 |
| 26 | QMAKE_CFLAGS_THREAD= -Kthread | 26 | QMAKE_CFLAGS_THREAD= -Kthread |
| 27 | 27 | ||
| 28 | QMAKE_CXX = CC | 28 | QMAKE_CXX = CC |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -43,13 +43,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= | 44 | QMAKE_INCDIR_OPENGL= |
| 45 | QMAKE_LIBDIR_OPENGL= | 45 | QMAKE_LIBDIR_OPENGL= |
| 46 | 46 | ||
| 47 | QMAKE_LINK = CC | 47 | QMAKE_LINK = CC |
| 48 | QMAKE_LINK_SHLIB= CC | 48 | QMAKE_LINK_SHLIB= CC |
| 49 | QMAKE_LFLAGS = | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -G | 52 | QMAKE_LFLAGS_SHLIB= -G |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 55 | QMAKE_LFLAGS_THREAD= -Kthread | 55 | QMAKE_LFLAGS_THREAD= -Kthread |
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf index 1f8e982..2ff9d3a 100644 --- a/mkspecs/unixware-g++/qmake.conf +++ b/mkspecs/unixware-g++/qmake.conf | |||
| @@ -10,24 +10,24 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 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 = | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= -O2 | 20 | QMAKE_CFLAGS_RELEASE= -O2 |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= | 24 | QMAKE_CFLAGS_THREAD= |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 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 |
| @@ -42,13 +42,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = | 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= | 53 | QMAKE_LFLAGS_SONAME= |
| 54 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf index f3219eb..c7b8229 100644 --- a/mkspecs/win32-borland/qmake.conf +++ b/mkspecs/win32-borland/qmake.conf | |||
| @@ -16,13 +16,13 @@ exists( $(QTDIR)\.qtwinconfig ) { | |||
| 16 | 16 | ||
| 17 | QMAKE_CC = bcc32 | 17 | QMAKE_CC = bcc32 |
| 18 | QMAKE_LEX = flex | 18 | QMAKE_LEX = flex |
| 19 | QMAKE_LEXFLAGS = | 19 | QMAKE_LEXFLAGS = |
| 20 | QMAKE_YACC = byacc | 20 | QMAKE_YACC = byacc |
| 21 | QMAKE_YACCFLAGS = -d | 21 | QMAKE_YACCFLAGS = -d |
| 22 | QMAKE_CFLAGS = -tWR | 22 | QMAKE_CFLAGS = -tWR $(CFLAGS_EXTRA) |
| 23 | QMAKE_CFLAGS_WARN_ON= -w -w-hid | 23 | QMAKE_CFLAGS_WARN_ON= -w -w-hid |
| 24 | QMAKE_CFLAGS_WARN_OFF= -w- | 24 | QMAKE_CFLAGS_WARN_OFF= -w- |
| 25 | QMAKE_CFLAGS_RELEASE= -O2 | 25 | QMAKE_CFLAGS_RELEASE= -O2 |
| 26 | QMAKE_CFLAGS_DEBUG= -v | 26 | QMAKE_CFLAGS_DEBUG= -v |
| 27 | QMAKE_CFLAGS_MT = -tWM | 27 | QMAKE_CFLAGS_MT = -tWM |
| 28 | QMAKE_CFLAGS_MT_DBG= -tWM | 28 | QMAKE_CFLAGS_MT_DBG= -tWM |
| @@ -32,17 +32,17 @@ QMAKE_CFLAGS_YACC = | |||
| 32 | QMAKE_CFLAGS_CONSOLE= -tWC | 32 | QMAKE_CFLAGS_CONSOLE= -tWC |
| 33 | 33 | ||
| 34 | !contains(CONFIG,exceptions){ | 34 | !contains(CONFIG,exceptions){ |
| 35 | QMAKE_CFLAGS += -x- | 35 | QMAKE_CFLAGS += -x- |
| 36 | } | 36 | } |
| 37 | !contains(CONFIG,rtti){ | 37 | !contains(CONFIG,rtti){ |
| 38 | QMAKE_CFLAGS+= -RT- | 38 | QMAKE_CFLAGS+= -RT- $(CFLAGS_EXTRA) |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | QMAKE_CXX = $$QMAKE_CC | 41 | QMAKE_CXX = $$QMAKE_CC |
| 42 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 42 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 43 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 43 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 44 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 44 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 45 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 45 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 46 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 46 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 47 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 47 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
| 48 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 48 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
| @@ -59,13 +59,13 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib | |||
| 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src | 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src |
| 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< | 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< |
| 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src | 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src |
| 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< | 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< |
| 63 | 63 | ||
| 64 | QMAKE_LINK = ilink32 | 64 | QMAKE_LINK = ilink32 |
| 65 | QMAKE_LFLAGS = -c -x -Gn | 65 | QMAKE_LFLAGS = -c -x -Gn $(LFLAGS_EXTRA) |
| 66 | QMAKE_LFLAGS_RELEASE= | 66 | QMAKE_LFLAGS_RELEASE= |
| 67 | QMAKE_LFLAGS_DEBUG= -v | 67 | QMAKE_LFLAGS_DEBUG= -v |
| 68 | QMAKE_LFLAGS_CONSOLE= -ap -Tpe c0x32.obj | 68 | QMAKE_LFLAGS_CONSOLE= -ap -Tpe c0x32.obj |
| 69 | QMAKE_LFLAGS_WINDOWS= -aa -Tpe c0w32.obj | 69 | QMAKE_LFLAGS_WINDOWS= -aa -Tpe c0w32.obj |
| 70 | QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj | 70 | QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj |
| 71 | QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj | 71 | QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj |
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 7c7b66a..8a24c43 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf | |||
| @@ -10,22 +10,22 @@ CONFIG += qt warn_on release | |||
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = byacc | 14 | QMAKE_YACC = byacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -fvtable-thunks | 16 | QMAKE_CFLAGS = -fvtable-thunks $(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= | 19 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= -O | 20 | QMAKE_CFLAGS_RELEASE= -O |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | 23 | ||
| 24 | QMAKE_CXX = g++ | 24 | QMAKE_CXX = g++ |
| 25 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 25 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 26 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 26 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 31 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| @@ -36,13 +36,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
| 36 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src | 36 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src |
| 37 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< | 37 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< |
| 38 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src | 38 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src |
| 39 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 39 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
| 40 | 40 | ||
| 41 | QMAKE_LINK = g++ | 41 | QMAKE_LINK = g++ |
| 42 | QMAKE_LFLAGS = | 42 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 43 | QMAKE_LFLAGS_RELEASE= | 43 | QMAKE_LFLAGS_RELEASE= |
| 44 | QMAKE_LFLAGS_DEBUG= | 44 | QMAKE_LFLAGS_DEBUG= |
| 45 | QMAKE_LFLAGS_CONSOLE= -Wl,-subsystem,console | 45 | QMAKE_LFLAGS_CONSOLE= -Wl,-subsystem,console |
| 46 | QMAKE_LFLAGS_WINDOWS= -Wl,-subsystem,windows | 46 | QMAKE_LFLAGS_WINDOWS= -Wl,-subsystem,windows |
| 47 | QMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console | 47 | QMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console |
| 48 | QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows | 48 | QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows |
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index cd884fa..b5476a0 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf | |||
| @@ -15,35 +15,35 @@ exists( $(QTDIR)\.qtwinconfig ) { | |||
| 15 | 15 | ||
| 16 | QMAKE_CC = icl | 16 | QMAKE_CC = icl |
| 17 | QMAKE_LEX = flex | 17 | QMAKE_LEX = flex |
| 18 | QMAKE_LEXFLAGS = | 18 | QMAKE_LEXFLAGS = |
| 19 | QMAKE_YACC = byacc | 19 | QMAKE_YACC = byacc |
| 20 | QMAKE_YACCFLAGS = -d | 20 | QMAKE_YACCFLAGS = -d |
| 21 | QMAKE_CFLAGS = -nologo -Zm200 | 21 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) |
| 22 | QMAKE_CFLAGS_WARN_ON= -W3 | 22 | QMAKE_CFLAGS_WARN_ON= -W3 |
| 23 | QMAKE_CFLAGS_WARN_OFF= -W0 | 23 | QMAKE_CFLAGS_WARN_OFF= -W0 |
| 24 | QMAKE_CFLAGS_RELEASE= -Od -Ob1s | 24 | QMAKE_CFLAGS_RELEASE= -Od -Ob1s |
| 25 | QMAKE_CFLAGS_DEBUG= -Zi | 25 | QMAKE_CFLAGS_DEBUG= -Zi |
| 26 | QMAKE_CFLAGS_MT = -MD | 26 | QMAKE_CFLAGS_MT = -MD |
| 27 | QMAKE_CFLAGS_MT_DBG= -MDd | 27 | QMAKE_CFLAGS_MT_DBG= -MDd |
| 28 | QMAKE_CFLAGS_MT_DLL= -MD | 28 | QMAKE_CFLAGS_MT_DLL= -MD |
| 29 | QMAKE_CFLAGS_MT_DLLDBG= -MDd | 29 | QMAKE_CFLAGS_MT_DLLDBG= -MDd |
| 30 | QMAKE_CFLAGS_YACC= | 30 | QMAKE_CFLAGS_YACC= |
| 31 | 31 | ||
| 32 | contains(CONFIG,stl){ | 32 | contains(CONFIG,stl){ |
| 33 | QMAKE_CFLAGS+= -GX | 33 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) |
| 34 | } | 34 | } |
| 35 | contains(CONFIG,exceptions){ | 35 | contains(CONFIG,exceptions){ |
| 36 | QMAKE_CFLAGS += -GX | 36 | QMAKE_CFLAGS += -GX |
| 37 | } | 37 | } |
| 38 | contains(CONFIG,rtti){ | 38 | contains(CONFIG,rtti){ |
| 39 | QMAKE_CFLAGS+= -GR | 39 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | QMAKE_CXX = $$QMAKE_CC | 42 | QMAKE_CXX = $$QMAKE_CC |
| 43 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 43 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 44 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 44 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 45 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 45 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 46 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 46 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 47 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 47 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 48 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 48 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
| 49 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 49 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
| @@ -59,13 +59,13 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib | |||
| 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
| 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
| 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src |
| 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
| 63 | 63 | ||
| 64 | QMAKE_LINK = link | 64 | QMAKE_LINK = link |
| 65 | QMAKE_LFLAGS = /NOLOGO | 65 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) |
| 66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll | 66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll |
| 67 | QMAKE_LFLAGS_DEBUG= /DEBUG | 67 | QMAKE_LFLAGS_DEBUG= /DEBUG |
| 68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console | 68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console |
| 69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows | 69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows |
| 70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL | 70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL |
| 71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL | 71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL |
diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf index bcc1ea7..d75a251 100644 --- a/mkspecs/win32-msvc.net/qmake.conf +++ b/mkspecs/win32-msvc.net/qmake.conf | |||
| @@ -15,13 +15,13 @@ exists( $(QTDIR)\.qtwinconfig ) { | |||
| 15 | 15 | ||
| 16 | QMAKE_CC = cl | 16 | QMAKE_CC = cl |
| 17 | QMAKE_LEX = flex | 17 | QMAKE_LEX = flex |
| 18 | QMAKE_LEXFLAGS = | 18 | QMAKE_LEXFLAGS = |
| 19 | QMAKE_YACC = byacc | 19 | QMAKE_YACC = byacc |
| 20 | QMAKE_YACCFLAGS = -d | 20 | QMAKE_YACCFLAGS = -d |
| 21 | QMAKE_CFLAGS = -nologo -Zm200 | 21 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) |
| 22 | QMAKE_CFLAGS_WARN_ON= -W3 | 22 | QMAKE_CFLAGS_WARN_ON= -W3 |
| 23 | QMAKE_CFLAGS_WARN_OFF= -W0 | 23 | QMAKE_CFLAGS_WARN_OFF= -W0 |
| 24 | QMAKE_CFLAGS_RELEASE= -O1 | 24 | QMAKE_CFLAGS_RELEASE= -O1 |
| 25 | QMAKE_CFLAGS_DEBUG= -Z7 | 25 | QMAKE_CFLAGS_DEBUG= -Z7 |
| 26 | QMAKE_CFLAGS_MT = -MD | 26 | QMAKE_CFLAGS_MT = -MD |
| 27 | QMAKE_CFLAGS_MT_DBG= -MD | 27 | QMAKE_CFLAGS_MT_DBG= -MD |
| @@ -29,23 +29,23 @@ QMAKE_CFLAGS_MT_DLL = -MD | |||
| 29 | QMAKE_CFLAGS_MT_DLLDBG= -MD | 29 | QMAKE_CFLAGS_MT_DLLDBG= -MD |
| 30 | QMAKE_CFLAGS_ST = -ML | 30 | QMAKE_CFLAGS_ST = -ML |
| 31 | QMAKE_CFLAGS_ST_DBG= -MLd | 31 | QMAKE_CFLAGS_ST_DBG= -MLd |
| 32 | QMAKE_CFLAGS_YACC= | 32 | QMAKE_CFLAGS_YACC= |
| 33 | 33 | ||
| 34 | contains(CONFIG,stl){ | 34 | contains(CONFIG,stl){ |
| 35 | QMAKE_CFLAGS+= -GX | 35 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) |
| 36 | } | 36 | } |
| 37 | contains(CONFIG,exceptions){ | 37 | contains(CONFIG,exceptions){ |
| 38 | QMAKE_CFLAGS += -GX | 38 | QMAKE_CFLAGS += -GX |
| 39 | } | 39 | } |
| 40 | contains(CONFIG,rtti){ | 40 | contains(CONFIG,rtti){ |
| 41 | QMAKE_CFLAGS+= -GR | 41 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | QMAKE_CXX = $$QMAKE_CC | 44 | QMAKE_CXX = $$QMAKE_CC |
| 45 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 45 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 46 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 46 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 47 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 47 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 48 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 48 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 49 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 49 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 50 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 50 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
| 51 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 51 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
| @@ -63,13 +63,13 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib | |||
| 63 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 63 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
| 64 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 64 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
| 65 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 65 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src |
| 66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
| 67 | 67 | ||
| 68 | QMAKE_LINK = link | 68 | QMAKE_LINK = link |
| 69 | QMAKE_LFLAGS = /NOLOGO | 69 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) |
| 70 | QMAKE_LFLAGS_RELEASE= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll | 70 | QMAKE_LFLAGS_RELEASE= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll |
| 71 | QMAKE_LFLAGS_DEBUG= /DEBUG | 71 | QMAKE_LFLAGS_DEBUG= /DEBUG |
| 72 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:CONSOLE | 72 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:CONSOLE |
| 73 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:WINDOWS | 73 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:WINDOWS |
| 74 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL | 74 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL |
| 75 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL | 75 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL |
diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf index 19462e4..f3be273 100644 --- a/mkspecs/win32-msvc/qmake.conf +++ b/mkspecs/win32-msvc/qmake.conf | |||
| @@ -15,35 +15,35 @@ exists( $(QTDIR)\.qtwinconfig ) { | |||
| 15 | 15 | ||
| 16 | QMAKE_CC = cl | 16 | QMAKE_CC = cl |
| 17 | QMAKE_LEX = flex | 17 | QMAKE_LEX = flex |
| 18 | QMAKE_LEXFLAGS = | 18 | QMAKE_LEXFLAGS = |
| 19 | QMAKE_YACC = byacc | 19 | QMAKE_YACC = byacc |
| 20 | QMAKE_YACCFLAGS = -d | 20 | QMAKE_YACCFLAGS = -d |
| 21 | QMAKE_CFLAGS = -nologo -Zm200 | 21 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) |
| 22 | QMAKE_CFLAGS_WARN_ON= -W3 | 22 | QMAKE_CFLAGS_WARN_ON= -W3 |
| 23 | QMAKE_CFLAGS_WARN_OFF= -W0 | 23 | QMAKE_CFLAGS_WARN_OFF= -W0 |
| 24 | QMAKE_CFLAGS_RELEASE= -O1 | 24 | QMAKE_CFLAGS_RELEASE= -O1 |
| 25 | QMAKE_CFLAGS_DEBUG= -Zi | 25 | QMAKE_CFLAGS_DEBUG= -Zi |
| 26 | QMAKE_CFLAGS_MT = -MD | 26 | QMAKE_CFLAGS_MT = -MD |
| 27 | QMAKE_CFLAGS_MT_DBG= -MDd | 27 | QMAKE_CFLAGS_MT_DBG= -MDd |
| 28 | QMAKE_CFLAGS_MT_DLL= -MD | 28 | QMAKE_CFLAGS_MT_DLL= -MD |
| 29 | QMAKE_CFLAGS_MT_DLLDBG= -MDd | 29 | QMAKE_CFLAGS_MT_DLLDBG= -MDd |
| 30 | QMAKE_CFLAGS_YACC= | 30 | QMAKE_CFLAGS_YACC= |
| 31 | 31 | ||
| 32 | contains(CONFIG,stl){ | 32 | contains(CONFIG,stl){ |
| 33 | QMAKE_CFLAGS+= -GX | 33 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) |
| 34 | } | 34 | } |
| 35 | contains(CONFIG,exceptions){ | 35 | contains(CONFIG,exceptions){ |
| 36 | QMAKE_CFLAGS += -GX | 36 | QMAKE_CFLAGS += -GX |
| 37 | } | 37 | } |
| 38 | contains(CONFIG,rtti){ | 38 | contains(CONFIG,rtti){ |
| 39 | QMAKE_CFLAGS+= -GR | 39 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | QMAKE_CXX = $$QMAKE_CC | 42 | QMAKE_CXX = $$QMAKE_CC |
| 43 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 43 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 44 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 44 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 45 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 45 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 46 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 46 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 47 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 47 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 48 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 48 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
| 49 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 49 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
| @@ -59,13 +59,13 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib | |||
| 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
| 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
| 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src |
| 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
| 63 | 63 | ||
| 64 | QMAKE_LINK = link | 64 | QMAKE_LINK = link |
| 65 | QMAKE_LFLAGS = /NOLOGO | 65 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) |
| 66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll | 66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll |
| 67 | QMAKE_LFLAGS_DEBUG= /DEBUG | 67 | QMAKE_LFLAGS_DEBUG= /DEBUG |
| 68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console | 68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console |
| 69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows | 69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows |
| 70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL | 70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL |
| 71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL | 71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL |
diff --git a/mkspecs/win32-visage/qmake.conf b/mkspecs/win32-visage/qmake.conf index ff6a1db..aa8e598 100644 --- a/mkspecs/win32-visage/qmake.conf +++ b/mkspecs/win32-visage/qmake.conf | |||
| @@ -9,21 +9,21 @@ CONFIG += qt warn_on release | |||
| 9 | 9 | ||
| 10 | QMAKE_CC = icc -C | 10 | QMAKE_CC = icc -C |
| 11 | QMAKE_LEX = flex | 11 | QMAKE_LEX = flex |
| 12 | QMAKE_LEXFLAGS = | 12 | QMAKE_LEXFLAGS = |
| 13 | QMAKE_YACC = byacc | 13 | QMAKE_YACC = byacc |
| 14 | QMAKE_YACCFLAGS = -d | 14 | QMAKE_YACCFLAGS = -d |
| 15 | QMAKE_CFLAGS = -Q -Ft -Gd -Gm+ -qrtti=all | 15 | QMAKE_CFLAGS = -Q -Ft -Gd -Gm+ -qrtti=all $(CFLAGS_EXTRA) |
| 16 | QMAKE_CFLAGS_WARN_ON= -W3 | 16 | QMAKE_CFLAGS_WARN_ON= -W3 |
| 17 | QMAKE_CFLAGS_WARN_OFF= -W0 | 17 | QMAKE_CFLAGS_WARN_OFF= -W0 |
| 18 | QMAKE_CFLAGS_RELEASE= -Gl+ -O -Oc+ | 18 | QMAKE_CFLAGS_RELEASE= -Gl+ -O -Oc+ |
| 19 | QMAKE_CFLAGS_DEBUG= -Fb* -Ti -Tm | 19 | QMAKE_CFLAGS_DEBUG= -Fb* -Ti -Tm |
| 20 | QMAKE_CFLAGS_YACC= | 20 | QMAKE_CFLAGS_YACC= |
| 21 | 21 | ||
| 22 | QMAKE_CXX = $$QMAKE_CC | 22 | QMAKE_CXX = $$QMAKE_CC |
| 23 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 23 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 24 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 24 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 25 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 25 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 26 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 26 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 27 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 27 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 28 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 28 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 29 | 29 | ||
| @@ -33,13 +33,13 @@ QMAKE_INCDIR_QT = $(QTDIR)\include | |||
| 33 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src | 33 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src |
| 34 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $< | 34 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $< |
| 35 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src | 35 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src |
| 36 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< | 36 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< |
| 37 | 37 | ||
| 38 | QMAKE_LINK = icc -Tdp $(CFLAGS) | 38 | QMAKE_LINK = icc -Tdp $(CFLAGS) |
| 39 | QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe | 39 | QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA) |
| 40 | QMAKE_LFLAGS_RELEASE= -OPTF | 40 | QMAKE_LFLAGS_RELEASE= -OPTF |
| 41 | QMAKE_LFLAGS_DEBUG= -de -br | 41 | QMAKE_LFLAGS_DEBUG= -de -br |
| 42 | QMAKE_LFLAGS_CONSOLE= -pmtype:vio | 42 | QMAKE_LFLAGS_CONSOLE= -pmtype:vio |
| 43 | QMAKE_LFLAGS_WINDOWS= -pmtype:pm | 43 | QMAKE_LFLAGS_WINDOWS= -pmtype:pm |
| 44 | QMAKE_LFLAGS_CONSOLE_DLL= -DLL | 44 | QMAKE_LFLAGS_CONSOLE_DLL= -DLL |
| 45 | QMAKE_LFLAGS_WINDOWS_DLL= -DLL | 45 | QMAKE_LFLAGS_WINDOWS_DLL= -DLL |
diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf index d034fe2..dd3a71d 100644 --- a/mkspecs/win32-watcom/qmake.conf +++ b/mkspecs/win32-watcom/qmake.conf | |||
| @@ -9,21 +9,21 @@ CONFIG += qt warn_on release | |||
| 9 | 9 | ||
| 10 | QMAKE_CC = wcl386 | 10 | QMAKE_CC = wcl386 |
| 11 | QMAKE_LEX = flex | 11 | QMAKE_LEX = flex |
| 12 | QMAKE_LEXFLAGS = | 12 | QMAKE_LEXFLAGS = |
| 13 | QMAKE_YACC = byacc | 13 | QMAKE_YACC = byacc |
| 14 | QMAKE_YACCFLAGS = -d | 14 | QMAKE_YACCFLAGS = -d |
| 15 | QMAKE_CFLAGS = -zq | 15 | QMAKE_CFLAGS = -zq $(CFLAGS_EXTRA) |
| 16 | QMAKE_CFLAGS_WARN_ON= -w2 | 16 | QMAKE_CFLAGS_WARN_ON= -w2 |
| 17 | QMAKE_CFLAGS_WARN_OFF= -w0 | 17 | QMAKE_CFLAGS_WARN_OFF= -w0 |
| 18 | QMAKE_CFLAGS_RELEASE= -ox | 18 | QMAKE_CFLAGS_RELEASE= -ox |
| 19 | QMAKE_CFLAGS_DEBUG= -d2 | 19 | QMAKE_CFLAGS_DEBUG= -d2 |
| 20 | QMAKE_CFLAGS_YACC= | 20 | QMAKE_CFLAGS_YACC= |
| 21 | 21 | ||
| 22 | QMAKE_CXX = $$QMAKE_CC | 22 | QMAKE_CXX = $$QMAKE_CC |
| 23 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 23 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 24 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 24 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 25 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 25 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 26 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 26 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 27 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 27 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 28 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 28 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 29 | 29 | ||
| @@ -31,13 +31,13 @@ QMAKE_INCDIR = | |||
| 31 | QMAKE_INCDIR_QT = $(QTDIR)\include | 31 | QMAKE_INCDIR_QT = $(QTDIR)\include |
| 32 | 32 | ||
| 33 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src | 33 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src |
| 34 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src | 34 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src |
| 35 | 35 | ||
| 36 | QMAKE_LINK = wlink | 36 | QMAKE_LINK = wlink |
| 37 | QMAKE_LFLAGS = op quiet op c | 37 | QMAKE_LFLAGS = op quiet op c $(LFLAGS_EXTRA) |
| 38 | QMAKE_LFLAGS_RELEASE= | 38 | QMAKE_LFLAGS_RELEASE= |
| 39 | QMAKE_LFLAGS_DEBUG= d all | 39 | QMAKE_LFLAGS_DEBUG= d all |
| 40 | QMAKE_LFLAGS_CONSOLE= sys nt | 40 | QMAKE_LFLAGS_CONSOLE= sys nt |
| 41 | QMAKE_LFLAGS_WINDOWS= sys nt_win | 41 | QMAKE_LFLAGS_WINDOWS= sys nt_win |
| 42 | QMAKE_LFLAGS_CONSOLE_DLL= sys nt | 42 | QMAKE_LFLAGS_CONSOLE_DLL= sys nt |
| 43 | QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win | 43 | QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win |