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/reliant-cds | |
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/reliant-cds/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf index 584bcf7..539cee7 100644 --- a/mkspecs/reliant-cds/qmake.conf +++ b/mkspecs/reliant-cds/qmake.conf | |||
@@ -33,49 +33,49 @@ 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 |
35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
36 | 36 | ||
37 | QMAKE_INCDIR = | 37 | QMAKE_INCDIR = |
38 | QMAKE_LIBDIR = | 38 | QMAKE_LIBDIR = |
39 | QMAKE_INCDIR_X11= /opt/X/include/X11 | 39 | QMAKE_INCDIR_X11= /opt/X/include/X11 |
40 | QMAKE_LIBDIR_X11= /opt/X/lib | 40 | QMAKE_LIBDIR_X11= /opt/X/lib |
41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | 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 = $(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= -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 |
55 | QMAKE_RPATH = -Wl,-Brpath=, | 55 | QMAKE_RPATH = -Wl,-Brpath=, |
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 -lresolv -lsocket -lnsl -lm | 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm |
60 | QMAKE_LIBS_X11SM= -lSM -lICE | 60 | QMAKE_LIBS_X11SM= -lSM -lICE |
61 | QMAKE_LIBS_QT = -lqt | 61 | QMAKE_LIBS_QT = -lqt |
62 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
65 | QMAKE_LIBS_THREAD= | 65 | QMAKE_LIBS_THREAD= |
66 | 66 | ||
67 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
68 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
69 | 69 | ||
70 | QMAKE_AR = CC -xar -o | 70 | QMAKE_AR = CC -xar -o |
71 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
72 | 72 | ||
73 | QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB | 73 | QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB |
74 | 74 | ||
75 | QMAKE_TAR = tar -cf | 75 | QMAKE_TAR = tar -cf |
76 | QMAKE_GZIP = gzip -9f | 76 | QMAKE_GZIP = gzip -9f |
77 | 77 | ||
78 | QMAKE_COPY = cp -f | 78 | QMAKE_COPY = cp -f |
79 | QMAKE_MOVE = mv -f | 79 | QMAKE_MOVE = mv -f |
80 | QMAKE_DEL_FILE = rm -f | 80 | QMAKE_DEL_FILE = rm -f |
81 | QMAKE_DEL_DIR = rmdir | 81 | QMAKE_DEL_DIR = rmdir |