Corrected QMAKE_LINK and QMAKE_LINK_SHLIB, should be arm-linux-gcc, not arm-linux-g++.

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 /mkspecs
parent: 7911ebe3b7279874ed33e6b6fc564abdf31aea7a (diff)
download: opie-22b6762b871b64825e1f8e974636c2d27fef8486.zip
opie-22b6762b871b64825e1f8e974636c2d27fef8486.tar.gz
opie-22b6762b871b64825e1f8e974636c2d27fef8486.tar.bz2
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
@@ -32,26 +32,26 @@ QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
        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      = arm-linux-g++
+        QMAKE_LINK      = arm-linux-gcc
-        QMAKE_LINK_SHLIB= arm-linux-g++
+        QMAKE_LINK_SHLIB= arm-linux-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,
        QMAKE_LIBS      = 
 QMAKE_LIBS_DYNLOAD      = -ldl
        QMAKE_LIBS_X11  = 
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
@@ -32,26 +32,26 @@ QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
        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      = arm-linux-g++
+        QMAKE_LINK      = arm-linux-gcc
-        QMAKE_LINK_SHLIB= arm-linux-g++
+        QMAKE_LINK_SHLIB= arm-linux-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,
        QMAKE_LIBS      = 
 QMAKE_LIBS_DYNLOAD      = -ldl
        QMAKE_LIBS_X11  = 
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
@@ -32,26 +32,26 @@ QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
        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      = arm-linux-g++
+        QMAKE_LINK      = arm-linux-gcc
-        QMAKE_LINK_SHLIB= arm-linux-g++
+        QMAKE_LINK_SHLIB= arm-linux-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,
        QMAKE_LIBS      = 
 QMAKE_LIBS_DYNLOAD      = -ldl
        QMAKE_LIBS_X11  =
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 /mkspecs
parent	7911ebe3b7279874ed33e6b6fc564abdf31aea7a (diff)
download	opie-22b6762b871b64825e1f8e974636c2d27fef8486.zip opie-22b6762b871b64825e1f8e974636c2d27fef8486.tar.gz opie-22b6762b871b64825e1f8e974636c2d27fef8486.tar.bz2

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
@@ -32,26 +32,26 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
34		34
35	QMAKE_INCDIR =	35	QMAKE_INCDIR =
36	QMAKE_LIBDIR =	36	QMAKE_LIBDIR =
37	QMAKE_INCDIR_X11=	37	QMAKE_INCDIR_X11=
38	QMAKE_LIBDIR_X11=	38	QMAKE_LIBDIR_X11=
39	QMAKE_INCDIR_QT = $(QTDIR)/include	39	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
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,	53	QMAKE_RPATH = -Wl,-rpath,
54		54
55	QMAKE_LIBS =	55	QMAKE_LIBS =
56	QMAKE_LIBS_DYNLOAD = -ldl	56	QMAKE_LIBS_DYNLOAD = -ldl
57	QMAKE_LIBS_X11 =	57	QMAKE_LIBS_X11 =


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
@@ -32,26 +32,26 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
34		34
35	QMAKE_INCDIR =	35	QMAKE_INCDIR =
36	QMAKE_LIBDIR =	36	QMAKE_LIBDIR =
37	QMAKE_INCDIR_X11=	37	QMAKE_INCDIR_X11=
38	QMAKE_LIBDIR_X11=	38	QMAKE_LIBDIR_X11=
39	QMAKE_INCDIR_QT = $(QTDIR)/include	39	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
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,	53	QMAKE_RPATH = -Wl,-rpath,
54		54
55	QMAKE_LIBS =	55	QMAKE_LIBS =
56	QMAKE_LIBS_DYNLOAD = -ldl	56	QMAKE_LIBS_DYNLOAD = -ldl
57	QMAKE_LIBS_X11 =	57	QMAKE_LIBS_X11 =


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
@@ -32,26 +32,26 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
34		34
35	QMAKE_INCDIR =	35	QMAKE_INCDIR =
36	QMAKE_LIBDIR =	36	QMAKE_LIBDIR =
37	QMAKE_INCDIR_X11=	37	QMAKE_INCDIR_X11=
38	QMAKE_LIBDIR_X11=	38	QMAKE_LIBDIR_X11=
39	QMAKE_INCDIR_QT = $(QTDIR)/include	39	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
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,	53	QMAKE_RPATH = -Wl,-rpath,
54		54
55	QMAKE_LIBS =	55	QMAKE_LIBS =
56	QMAKE_LIBS_DYNLOAD = -ldl	56	QMAKE_LIBS_DYNLOAD = -ldl
57	QMAKE_LIBS_X11 =	57	QMAKE_LIBS_X11 =