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/linux-icc | |
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/linux-icc/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index f6b721d..9dc7480 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf | |||
@@ -45,25 +45,25 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
45 | 45 | ||
46 | QMAKE_LINK = icpc | 46 | QMAKE_LINK = icpc |
47 | QMAKE_LINK_SHLIB= icpc | 47 | QMAKE_LINK_SHLIB= icpc |
48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
49 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
50 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
51 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
53 | QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname, |
54 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
55 | QMAKE_RPATH = -Qoption,ld,-rpath, | 55 | QMAKE_RPATH = -Qoption,ld,-rpath, |
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
60 | QMAKE_LIBS_X11SM= -lSM -lICE | 60 | QMAKE_LIBS_X11SM= -lSM -lICE |
61 | QMAKE_LIBS_NIS = -lnsl | 61 | QMAKE_LIBS_NIS = -lnsl |
62 | QMAKE_LIBS_QT = -lqt | 62 | QMAKE_LIBS_QT = -lqt |
63 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 63 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
66 | QMAKE_LIBS_THREAD= -lpthread | 66 | QMAKE_LIBS_THREAD= -lpthread |
67 | 67 | ||
68 | QMAKE_MOC = $(QTDIR)/bin/moc | 68 | QMAKE_MOC = $(QTDIR)/bin/moc |
69 | QMAKE_UIC = $(QTDIR)/bin/uic | 69 | QMAKE_UIC = $(QTDIR)/bin/uic |