author | kergoth <kergoth> | 2002-12-09 22:39:57 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-12-09 22:39:57 (UTC) |
commit | 421f5d6b87f509430836fb2c60b57f9266371121 (patch) (unidiff) | |
tree | 98c968915b1a9dcdd8eb3e3565c8859127f1c3e9 /mkspecs/qws | |
parent | 8bf05369dcdf93a712607aab6dacf407dcce5142 (diff) | |
download | opie-421f5d6b87f509430836fb2c60b57f9266371121.zip opie-421f5d6b87f509430836fb2c60b57f9266371121.tar.gz opie-421f5d6b87f509430836fb2c60b57f9266371121.tar.bz2 |
Add a var to pass in libs from teh environment easily.. needed so that the OZ buildroot can pass in -lsupc++ on the link when building with gcc3.
-rw-r--r-- | mkspecs/qws/freebsd-generic-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/linux-arm-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/linux-ipaq-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/linux-mips-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/linux-sharp-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/linux-x86-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/macx-generic-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/qnx4-cc/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/qnx6-generic-cc/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/qnx6-generic-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/qws/solaris-generic-g++/qmake.conf | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf index 546166e..82b22d7 100644 --- a/mkspecs/qws/freebsd-generic-g++/qmake.conf +++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf | |||
@@ -48,13 +48,13 @@ 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 |
52 | QMAKE_RPATH = -Wl,-rpath, | 52 | QMAKE_RPATH = -Wl,-rpath, |
53 | 53 | ||
54 | QMAKE_LIBS = | 54 | QMAKE_LIBS = $(LIBS_EXTRA) |
55 | QMAKE_LIBS_QT = -lqte | 55 | QMAKE_LIBS_QT = -lqte |
56 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 56 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
57 | QMAKE_LIBS_THREAD = | 57 | QMAKE_LIBS_THREAD = |
58 | 58 | ||
59 | QMAKE_MOC = $(QTDIR)/bin/moc | 59 | QMAKE_MOC = $(QTDIR)/bin/moc |
60 | QMAKE_UIC = $(QTDIR)/bin/uic | 60 | QMAKE_UIC = $(QTDIR)/bin/uic |
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf index 6a7a7a1..a5c08ae 100644 --- a/mkspecs/qws/linux-arm-g++/qmake.conf +++ b/mkspecs/qws/linux-arm-g++/qmake.conf | |||
@@ -49,13 +49,13 @@ 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 = |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index 43f0d7f..40af4ad 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf | |||
@@ -49,13 +49,13 @@ 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 = |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf index c5bc655..d8e2a4e 100644 --- a/mkspecs/qws/linux-ipaq-g++/qmake.conf +++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf | |||
@@ -49,13 +49,13 @@ 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 = |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
diff --git a/mkspecs/qws/linux-mips-g++/qmake.conf b/mkspecs/qws/linux-mips-g++/qmake.conf index a34b651..f5d2033 100644 --- a/mkspecs/qws/linux-mips-g++/qmake.conf +++ b/mkspecs/qws/linux-mips-g++/qmake.conf | |||
@@ -49,13 +49,13 @@ 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 = |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf index 538e243..06bf445 100644 --- a/mkspecs/qws/linux-sharp-g++/qmake.conf +++ b/mkspecs/qws/linux-sharp-g++/qmake.conf | |||
@@ -49,13 +49,13 @@ 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 = |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
diff --git a/mkspecs/qws/linux-x86-g++/qmake.conf b/mkspecs/qws/linux-x86-g++/qmake.conf index dfc5e30..fc5723a 100644 --- a/mkspecs/qws/linux-x86-g++/qmake.conf +++ b/mkspecs/qws/linux-x86-g++/qmake.conf | |||
@@ -49,13 +49,13 @@ 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 = |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index aa6251f..3460a40 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf | |||
@@ -51,13 +51,13 @@ 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= |
54 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
55 | QMAKE_RPATH = | 55 | QMAKE_RPATH = |
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_X11 = | 58 | QMAKE_LIBS_X11 = |
59 | QMAKE_LIBS_X11SM= | 59 | QMAKE_LIBS_X11SM= |
60 | QMAKE_LIBS_QT = -lqte | 60 | QMAKE_LIBS_QT = -lqte |
61 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 61 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
62 | QMAKE_LIBS_QT_OPENGL= -lqgl | 62 | QMAKE_LIBS_QT_OPENGL= -lqgl |
63 | QMAKE_LIBS_THREAD= | 63 | QMAKE_LIBS_THREAD= |
diff --git a/mkspecs/qws/qnx4-cc/qmake.conf b/mkspecs/qws/qnx4-cc/qmake.conf index ee4a9ec..1ca2029 100644 --- a/mkspecs/qws/qnx4-cc/qmake.conf +++ b/mkspecs/qws/qnx4-cc/qmake.conf | |||
@@ -46,13 +46,13 @@ 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= |
50 | QMAKE_RPATH = | 50 | QMAKE_RPATH = |
51 | 51 | ||
52 | QMAKE_LIBS = -lsocket | 52 | QMAKE_LIBS = $(LIBS_EXTRA) |
53 | QMAKE_LIBS_DYNLOAD= | 53 | QMAKE_LIBS_DYNLOAD= |
54 | QMAKE_LIBS_QT = -T 1 -lqte | 54 | QMAKE_LIBS_QT = -T 1 -lqte |
55 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 55 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
56 | QMAKE_LIBS_THREAD= | 56 | QMAKE_LIBS_THREAD= |
57 | 57 | ||
58 | QMAKE_MOC = $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH) | 58 | QMAKE_MOC = $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH) |
diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf index ae113fd..51eb3fe 100644 --- a/mkspecs/qws/qnx6-generic-cc/qmake.conf +++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf | |||
@@ -49,13 +49,13 @@ 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= |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = -lsocket -lcpp | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= | 56 | QMAKE_LIBS_DYNLOAD= |
57 | QMAKE_LIBS_X11 = -ldisputil -lm | 57 | QMAKE_LIBS_X11 = -ldisputil -lm |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
diff --git a/mkspecs/qws/qnx6-generic-g++/qmake.conf b/mkspecs/qws/qnx6-generic-g++/qmake.conf index 6961345..3519a59 100644 --- a/mkspecs/qws/qnx6-generic-g++/qmake.conf +++ b/mkspecs/qws/qnx6-generic-g++/qmake.conf | |||
@@ -49,13 +49,13 @@ 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= |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = -lsocket | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= | 56 | QMAKE_LIBS_DYNLOAD= |
57 | QMAKE_LIBS_X11 = -ldisputil -lm | 57 | QMAKE_LIBS_X11 = -ldisputil -lm |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf index d286d5b..057e343 100644 --- a/mkspecs/qws/solaris-generic-g++/qmake.conf +++ b/mkspecs/qws/solaris-generic-g++/qmake.conf | |||
@@ -49,13 +49,13 @@ 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= |
53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
54 | 54 | ||
55 | QMAKE_LIBS = -lsocket -lnsl -lresolv | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= -ldl | 56 | QMAKE_LIBS_DYNLOAD= -ldl |
57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
60 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |