author | kergoth <kergoth> | 2002-11-06 04:05:21 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 04:05:21 (UTC) |
commit | ac1509552bf764ff136690e0e7014d37a59d073e (patch) (unidiff) | |
tree | 6582d6f7574be2f468519b100889cc6c9113c85c /mkspecs/qws | |
parent | 6b7d5deabe1d2da336fbe6c8409e437cbb8a1c89 (diff) | |
download | opie-ac1509552bf764ff136690e0e7014d37a59d073e.zip opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.gz opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.bz2 |
Add an easy means of passing in extra cflags, cxxflags, ldflags from the environment
-rw-r--r-- | mkspecs/qws/freebsd-generic-g++/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/linux-arm-g++/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/linux-ipaq-g++/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/linux-mips-g++/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/linux-sharp-g++/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/linux-x86-g++/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/macx-generic-g++/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/qnx4-cc/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/qnx6-generic-cc/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/qnx6-generic-g++/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/qws/solaris-generic-g++/qmake.conf | 6 |
12 files changed, 36 insertions, 36 deletions
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 | |||
@@ -14,5 +14,5 @@ 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 |
@@ -26,5 +26,5 @@ QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE | |||
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 |
@@ -43,5 +43,5 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib | |||
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= |
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 | |||
@@ -14,5 +14,5 @@ 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= |
@@ -24,5 +24,5 @@ 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 |
@@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |
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 | |||
@@ -14,5 +14,5 @@ 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= |
@@ -24,5 +24,5 @@ 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 |
@@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |
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 | |||
@@ -14,5 +14,5 @@ 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= |
@@ -24,5 +24,5 @@ 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 |
@@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |
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 | |||
@@ -14,5 +14,5 @@ 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= |
@@ -24,5 +24,5 @@ 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 |
@@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |
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 | |||
@@ -14,5 +14,5 @@ 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= |
@@ -24,5 +24,5 @@ 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 |
@@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |
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 | |||
@@ -14,5 +14,5 @@ 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= |
@@ -24,5 +24,5 @@ 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 |
@@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |
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 | |||
@@ -15,5 +15,5 @@ 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= |
@@ -25,5 +25,5 @@ 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 |
@@ -45,5 +45,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |
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 | |||
@@ -14,5 +14,5 @@ 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 |
@@ -24,5 +24,5 @@ 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 |
@@ -41,5 +41,5 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib | |||
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 |
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 | |||
@@ -14,5 +14,5 @@ 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 |
@@ -24,5 +24,5 @@ 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 |
@@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |
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 | |||
@@ -14,5 +14,5 @@ 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 |
@@ -24,5 +24,5 @@ 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 |
@@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |
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 | |||
@@ -14,5 +14,5 @@ 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= |
@@ -24,5 +24,5 @@ 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 |
@@ -44,5 +44,5 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
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= |