author | mickeyl <mickeyl> | 2004-03-28 14:15:47 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-28 14:15:47 (UTC) |
commit | 6c102bd456d760fbe237fd49ce46f212614f228a (patch) (side-by-side diff) | |
tree | 2e90ded67cf2e461b030a42ada6b6500d25e746d /mkspecs/qws | |
parent | ca32f9c2a799aec751efd82e73c3154de1afe957 (diff) | |
download | opie-6c102bd456d760fbe237fd49ce46f212614f228a.zip opie-6c102bd456d760fbe237fd49ce46f212614f228a.tar.gz opie-6c102bd456d760fbe237fd49ce46f212614f228a.tar.bz2 |
we need to use -rpath, not -rpath-link on x86 or else the inputmethods don't
find their stuff (e.g. libpickboard.so) in <whereYourOpieDirIs>/plugins/inputmethods/
-rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index bccb196..add69b3 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf @@ -36,26 +36,26 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ +QMAKE_LINK = gcc +QMAKE_LINK_SHLIB = gcc QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath-link, +QMAKE_RPATH = -Wl,-rpath, QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = QMAKE_LIBS_X11SM = QMAKE_LIBS_QT = -lqte QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl |