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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -27,3 +27,3 @@ QMAKE_CXX = g++ QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -47,3 +47,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -16,3 +16,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -qstrict -q64 +QMAKE_CFLAGS = -qstrict -q64 $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -qwarn64 @@ -27,3 +27,3 @@ QMAKE_CXX = xlC QMAKE_CXX_THREAD = xlC_r -QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -54,3 +54,3 @@ QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 -X64 \ mv lib$(QMAKE_TARGET).a $(DESTDIR) -QMAKE_LFLAGS = -q64 +QMAKE_LFLAGS = -q64 $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -16,3 +16,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -qstrict +QMAKE_CFLAGS = -qstrict $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = @@ -27,3 +27,3 @@ QMAKE_CXX = xlC QMAKE_CXX_THREAD = xlC_r -QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -54,3 +54,3 @@ QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 \ mv lib$(QMAKE_TARGET).a $(DESTDIR) -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -17,3 +17,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -28,3 +28,3 @@ QMAKE_CFLAGS_THREAD = QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -50,3 +50,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -16,3 +16,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -27,3 +27,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -48,3 +48,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -27,3 +27,3 @@ QMAKE_CFLAGS_THREAD = QMAKE_CXX = c++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -48,3 +48,3 @@ QMAKE_LINK = c++ QMAKE_LINK_SHLIB = c++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -17,3 +17,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -27,3 +27,3 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -48,3 +48,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -58,3 +58,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Ae +DA2.0W -w +QMAKE_CFLAGS = -Ae +DA2.0W -w $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = @@ -68,3 +68,3 @@ QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE QMAKE_CXX = aCC -QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ +QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -88,3 +88,3 @@ QMAKE_LINK = aCC QMAKE_LINK_SHLIB = aCC -QMAKE_LFLAGS = +DA2.0W -Wl,+s +QMAKE_LFLAGS = +DA2.0W -Wl,+s $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = -O 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 @@ -58,3 +58,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Ae +DA2.0 -w +QMAKE_CFLAGS = -Ae +DA2.0 -w $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = @@ -68,3 +68,3 @@ QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE QMAKE_CXX = aCC -QMAKE_CXXFLAGS = +DA2.0 -w -D__STRICT_ANSI__ +QMAKE_CXXFLAGS = +DA2.0 -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -88,3 +88,3 @@ QMAKE_LINK = aCC QMAKE_LINK_SHLIB = aCC -QMAKE_LFLAGS = +DA2.0 -Wl,+s +QMAKE_LFLAGS = +DA2.0 -Wl,+s $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = -O 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 @@ -37,3 +37,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Ae +DAportable -w +Z +QMAKE_CFLAGS = -Ae +DAportable -w +Z $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = @@ -47,3 +47,3 @@ QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE QMAKE_CXX = aCC -QMAKE_CXXFLAGS = +DAportable -w +Z -D__STRICT_ANSI__ +QMAKE_CXXFLAGS = +DAportable -w +Z -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -67,3 +67,3 @@ QMAKE_LINK = aCC QMAKE_LINK_SHLIB = aCC -QMAKE_LFLAGS = +DAportable -Wl,+s +QMAKE_LFLAGS = +DAportable -Wl,+s $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = -O 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 @@ -38,3 +38,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Ae +DA1.1e -w +QMAKE_CFLAGS = -Ae +DA1.1e -w $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = @@ -47,3 +47,3 @@ QMAKE_CFLAGS_YACC = QMAKE_CXX = CC -QMAKE_CXXFLAGS = +DA1.1e -w +a1 +QMAKE_CXXFLAGS = +DA1.1e -w +a1 $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -67,3 +67,3 @@ QMAKE_LINK_SHLIB = CC # CC generates template code during linking, and so needs -I's -QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT +QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = -O -s 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 @@ -19,3 +19,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -30,3 +30,3 @@ QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -51,3 +51,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -Wl,+s +QMAKE_LFLAGS = -Wl,+s $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -18,3 +18,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -28,3 +28,3 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -48,3 +48,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib +QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -47,3 +47,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506 +QMAKE_CFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -58,3 +58,3 @@ QMAKE_CFLAGS_THREAD = QMAKE_CXX = CC -QMAKE_CXXFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 +QMAKE_CXXFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -79,3 +79,3 @@ QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -64 +QMAKE_LFLAGS = -64 $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -22,3 +22,3 @@ QMAKE_YACCFLAGS = -d QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS = -o32 -woff 3203,3260,3672 +QMAKE_CFLAGS = -o32 -woff 3203,3260,3672 $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -fullwarn @@ -32,3 +32,3 @@ QMAKE_CFLAGS_THREAD = QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -53,3 +53,3 @@ QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -o32 +QMAKE_LFLAGS = -o32 $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -47,3 +47,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -n32 -woff 1021,1209,1233,1314,1355,1375,1506 +QMAKE_CFLAGS = -n32 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -58,3 +58,3 @@ QMAKE_CFLAGS_THREAD = QMAKE_CXX = CC -QMAKE_CXXFLAGS = -n32 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 +QMAKE_CXXFLAGS = -n32 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -79,3 +79,3 @@ QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -n32 +QMAKE_LFLAGS = -n32 $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -w +QMAKE_CFLAGS = -w $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -25,3 +25,3 @@ QMAKE_CFLAGS_YACC = -Olimit 1000 QMAKE_CXX = cxx -QMAKE_CXXFLAGS = -w +QMAKE_CXXFLAGS = -w $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -45,3 +45,3 @@ QMAKE_LINK = cxx QMAKE_LINK_SHLIB = cxx -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -16,3 +16,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -27,3 +27,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -48,3 +48,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = icpc -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = icpc QMAKE_LINK_SHLIB = icpc -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -22,3 +22,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = --c --display_error_number --backend -pipe +QMAKE_CFLAGS = --c --display_error_number --backend -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -33,3 +33,3 @@ QMAKE_CFLAGS_THREAD = --thread_safe QMAKE_CXX = KCC -QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 --backend -pipe +QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 --backend -pipe $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -54,3 +54,3 @@ QMAKE_LINK = KCC QMAKE_LINK_SHLIB = KCC -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = pgCC -QMAKE_CXXFLAGS = --display_error_number $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = --display_error_number $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = pgCC QMAKE_LINK_SHLIB = pgCC -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -17,3 +17,3 @@ QMAKE_YACCFLAGS = -d QMAKE_RESOURCE = /Developer/Tools/Rez -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -28,3 +28,3 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = $(TB)c++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -46,3 +46,3 @@ QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) #QMAKE_LFLAGS_PREBIND = -prebind -seg1addr 0x90000000 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 @@ -16,3 +16,3 @@ QMAKE_YACCFLAGS = -d QMAKE_RESOURCE = /Developer/Tools/Rez -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -27,3 +27,3 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = c++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -46,3 +46,3 @@ QMAKE_LINK = c++ QMAKE_LINK_SHLIB = c++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -pthread QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -48,3 +48,3 @@ QMAKE_LINK_SHLIB = g++ QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -pthread QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -50,3 +50,3 @@ QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $(LFLAGS) \ -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -17,3 +17,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct +QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -28,3 +28,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -49,3 +49,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -27,3 +27,3 @@ QMAKE_CXX = g++ QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -44,3 +44,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = arm-linux-g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -45,3 +45,3 @@ QMAKE_LINK = arm-linux-g++ QMAKE_LINK_SHLIB = arm-linux-g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -45,3 +45,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = arm-linux-g++ -DQT_QWS_IPAQ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -45,3 +45,3 @@ QMAKE_LINK = arm-linux-g++ QMAKE_LINK_SHLIB = arm-linux-g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = mipsel-linux-g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -45,3 +45,3 @@ QMAKE_LINK = mipsel-linux-g++ QMAKE_LINK_SHLIB = mipsel-linux-g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = arm-linux-g++ -DQT_QWS_SHARP -DQT_QWS_EBX -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -45,3 +45,3 @@ QMAKE_LINK = arm-linux-g++ QMAKE_LINK_SHLIB = arm-linux-g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -45,3 +45,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -16,3 +16,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = $(TB)c++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -46,3 +46,3 @@ QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -WC,-sg +QMAKE_CFLAGS = -WC,-sg $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -w1 @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT -WC,-bm QMAKE_CXX = cc -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS $(CXXFLAGS_EXTRA) 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 @@ -42,3 +42,3 @@ QMAKE_LINK = cc QMAKE_LINK_SHLIB = cc -QMAKE_LFLAGS = -lsocket +QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED +QMAKE_CFLAGS = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = cc -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 +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) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -45,3 +45,3 @@ QMAKE_LINK = cc QMAKE_LINK_SHLIB = cc -QMAKE_LFLAGS = -lsocket -ldisputil +QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct -fhonor-std -fexceptions -D_STRINGS_H_INCLUDED +QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct -fhonor-std -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = cc -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 +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) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -45,3 +45,3 @@ QMAKE_LINK = cc -fhonor-std QMAKE_LINK_SHLIB = cc -fhonor-std -QMAKE_LFLAGS = -lsocket -ldisputil +QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W @@ -25,3 +25,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_SOUND -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_SOUND -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -45,3 +45,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Klp64 +QMAKE_CFLAGS = -Klp64 $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -K pthread QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -Klp64 +QMAKE_LFLAGS = -Klp64 $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -K pthread QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -18,3 +18,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = @@ -28,3 +28,3 @@ QMAKE_CFLAGS_THREAD = -Kthread QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -48,3 +48,3 @@ QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -33,3 +33,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ +QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -xM @@ -44,3 +44,3 @@ QMAKE_CFLAGS_THREAD = -mt QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -65,3 +65,3 @@ QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -xarch=v9 +QMAKE_LFLAGS = -xarch=v9 $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -16,3 +16,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -xM @@ -27,3 +27,3 @@ QMAKE_CFLAGS_THREAD = -mt QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -48,3 +48,3 @@ QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -R$(QTDIR)/lib +QMAKE_LFLAGS = -R$(QTDIR)/lib $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -38,3 +38,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ +QMAKE_CFLAGS = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -49,3 +49,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -70,3 +70,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -m64 +QMAKE_LFLAGS = -m64 $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -21,3 +21,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -32,3 +32,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -53,3 +53,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -26,3 +26,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = --c --display_error_number +QMAKE_CFLAGS = --c --display_error_number $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -37,3 +37,3 @@ QMAKE_CFLAGS_THREAD = -mt QMAKE_CXX = KCC -QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 +QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -58,3 +58,3 @@ QMAKE_LINK = KCC QMAKE_LINK_SHLIB = KCC -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -pthread QMAKE_CXX = cxx -QMAKE_CXXFLAGS = -x cxx $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = -x cxx $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = cxx QMAKE_LINK_SHLIB = cxx -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -25,3 +25,3 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -45,3 +45,3 @@ QMAKE_LINK = g++ #QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -18,3 +18,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = @@ -28,3 +28,3 @@ QMAKE_CFLAGS_THREAD = -Kthread QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -48,3 +48,3 @@ QMAKE_LINK = CC QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -26,3 +26,3 @@ QMAKE_CFLAGS_THREAD = QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -47,3 +47,3 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -21,3 +21,3 @@ QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -tWR +QMAKE_CFLAGS = -tWR $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -w -w-hid @@ -37,3 +37,3 @@ QMAKE_CFLAGS_CONSOLE = -tWC !contains(CONFIG,rtti){ - QMAKE_CFLAGS += -RT- + QMAKE_CFLAGS += -RT- $(CFLAGS_EXTRA) } @@ -41,3 +41,3 @@ QMAKE_CFLAGS_CONSOLE = -tWC QMAKE_CXX = $$QMAKE_CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -64,3 +64,3 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< QMAKE_LINK = ilink32 -QMAKE_LFLAGS = -c -x -Gn +QMAKE_LFLAGS = -c -x -Gn $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -15,3 +15,3 @@ QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -fvtable-thunks +QMAKE_CFLAGS = -fvtable-thunks $(CFLAGS_EXTRA) QMAKE_CFLAGS_DEPS = -M @@ -24,3 +24,3 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS @@ -41,3 +41,3 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< QMAKE_LINK = g++ -QMAKE_LFLAGS = +QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = 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 @@ -20,3 +20,3 @@ QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -Zm200 +QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -W3 @@ -32,3 +32,3 @@ QMAKE_CFLAGS_YACC = contains(CONFIG,stl){ - QMAKE_CFLAGS += -GX + QMAKE_CFLAGS += -GX $(CFLAGS_EXTRA) } @@ -38,3 +38,3 @@ contains(CONFIG,exceptions){ contains(CONFIG,rtti){ - QMAKE_CFLAGS += -GR + QMAKE_CFLAGS += -GR $(CFLAGS_EXTRA) } @@ -42,3 +42,3 @@ contains(CONFIG,rtti){ QMAKE_CXX = $$QMAKE_CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -64,3 +64,3 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_LINK = link -QMAKE_LFLAGS = /NOLOGO +QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.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 @@ -20,3 +20,3 @@ QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -Zm200 +QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -W3 @@ -34,3 +34,3 @@ QMAKE_CFLAGS_YACC = contains(CONFIG,stl){ - QMAKE_CFLAGS += -GX + QMAKE_CFLAGS += -GX $(CFLAGS_EXTRA) } @@ -40,3 +40,3 @@ contains(CONFIG,exceptions){ contains(CONFIG,rtti){ - QMAKE_CFLAGS += -GR + QMAKE_CFLAGS += -GR $(CFLAGS_EXTRA) } @@ -44,3 +44,3 @@ contains(CONFIG,rtti){ QMAKE_CXX = $$QMAKE_CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -68,3 +68,3 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_LINK = link -QMAKE_LFLAGS = /NOLOGO +QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.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 @@ -20,3 +20,3 @@ QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -Zm200 +QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -W3 @@ -32,3 +32,3 @@ QMAKE_CFLAGS_YACC = contains(CONFIG,stl){ - QMAKE_CFLAGS += -GX + QMAKE_CFLAGS += -GX $(CFLAGS_EXTRA) } @@ -38,3 +38,3 @@ contains(CONFIG,exceptions){ contains(CONFIG,rtti){ - QMAKE_CFLAGS += -GR + QMAKE_CFLAGS += -GR $(CFLAGS_EXTRA) } @@ -42,3 +42,3 @@ contains(CONFIG,rtti){ QMAKE_CXX = $$QMAKE_CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -64,3 +64,3 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_LINK = link -QMAKE_LFLAGS = /NOLOGO +QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.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 @@ -14,3 +14,3 @@ QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Q -Ft -Gd -Gm+ -qrtti=all +QMAKE_CFLAGS = -Q -Ft -Gd -Gm+ -qrtti=all $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -W3 @@ -22,3 +22,3 @@ QMAKE_CFLAGS_YACC = QMAKE_CXX = $$QMAKE_CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -38,3 +38,3 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< QMAKE_LINK = icc -Tdp $(CFLAGS) -QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe +QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = -OPTF 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 @@ -14,3 +14,3 @@ QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -zq +QMAKE_CFLAGS = -zq $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -w2 @@ -22,3 +22,3 @@ QMAKE_CFLAGS_YACC = QMAKE_CXX = $$QMAKE_CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -36,3 +36,3 @@ QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src QMAKE_LINK = wlink -QMAKE_LFLAGS = op quiet op c +QMAKE_LFLAGS = op quiet op c $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = |