author | kergoth <kergoth> | 2002-12-06 23:10:07 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-12-06 23:10:07 (UTC) |
commit | 22b6762b871b64825e1f8e974636c2d27fef8486 (patch) (unidiff) | |
tree | 212629b83d600883116ac4649b0de757db978705 | |
parent | 7911ebe3b7279874ed33e6b6fc564abdf31aea7a (diff) | |
download | opie-22b6762b871b64825e1f8e974636c2d27fef8486.zip opie-22b6762b871b64825e1f8e974636c2d27fef8486.tar.gz opie-22b6762b871b64825e1f8e974636c2d27fef8486.tar.bz2 |
Corrected QMAKE_LINK and QMAKE_LINK_SHLIB, should be arm-linux-gcc, not arm-linux-g++.
-rw-r--r-- | mkspecs/qws/linux-arm-g++/qmake.conf | 4 | ||||
-rw-r--r-- | mkspecs/qws/linux-ipaq-g++/qmake.conf | 4 | ||||
-rw-r--r-- | mkspecs/qws/linux-sharp-g++/qmake.conf | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf index 8eabcb9..6a7a7a1 100644 --- a/mkspecs/qws/linux-arm-g++/qmake.conf +++ b/mkspecs/qws/linux-arm-g++/qmake.conf | |||
@@ -40,10 +40,10 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | 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 = arm-linux-g++ | 44 | QMAKE_LINK = arm-linux-gcc |
45 | QMAKE_LINK_SHLIB= arm-linux-g++ | 45 | QMAKE_LINK_SHLIB= arm-linux-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= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf index c06e614..c5bc655 100644 --- a/mkspecs/qws/linux-ipaq-g++/qmake.conf +++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf | |||
@@ -40,10 +40,10 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | 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 = arm-linux-g++ | 44 | QMAKE_LINK = arm-linux-gcc |
45 | QMAKE_LINK_SHLIB= arm-linux-g++ | 45 | QMAKE_LINK_SHLIB= arm-linux-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= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf index 0c7ee7f..538e243 100644 --- a/mkspecs/qws/linux-sharp-g++/qmake.conf +++ b/mkspecs/qws/linux-sharp-g++/qmake.conf | |||
@@ -40,10 +40,10 @@ QMAKE_INCDIR_QT = $(QTDIR)/include | |||
40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | 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 = arm-linux-g++ | 44 | QMAKE_LINK = arm-linux-gcc |
45 | QMAKE_LINK_SHLIB= arm-linux-g++ | 45 | QMAKE_LINK_SHLIB= arm-linux-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= |
49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |