| author | mickeyl <mickeyl> | 2004-03-28 14:15:47 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-03-28 14:15:47 (UTC) |
| commit | 6c102bd456d760fbe237fd49ce46f212614f228a (patch) (unidiff) | |
| tree | 2e90ded67cf2e461b030a42ada6b6500d25e746d /mkspecs | |
| 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 | |||
| @@ -41,8 +41,8 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib | |||
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = g++ | 44 | QMAKE_LINK = gcc |
| 45 | QMAKE_LINK_SHLIB= g++ | 45 | QMAKE_LINK_SHLIB= gcc |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| @@ -50,7 +50,7 @@ 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-link, | 53 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 54 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |