summaryrefslogtreecommitdiff
path: root/mkspecs/qws
authormickeyl <mickeyl>2005-02-12 15:47:06 (UTC)
committer mickeyl <mickeyl>2005-02-12 15:47:06 (UTC)
commit0bf0f893a82426615cfe9f0bf764e1344c733ee3 (patch) (side-by-side diff)
treeba147bb8ea70b409f15a76196097de49056576b6 /mkspecs/qws
parentf13760433a6526555bc5a4378ee3517f4053ac61 (diff)
downloadopie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.zip
opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.gz
opie-0bf0f893a82426615cfe9f0bf764e1344c733ee3.tar.bz2
remove arm-linux'isms from linux-oe-g++ and make it depending on the value of OE_TARGET_SYS
this enables to build Opie against OE staging area targetting e.g. uclibc, mips, or whatever
Diffstat (limited to 'mkspecs/qws') (more/less context) (show whitespace changes)
-rw-r--r--mkspecs/qws/linux-oe-g++/qmake.conf12
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf
index 72bb489..bae5dbb 100644
--- a/mkspecs/qws/linux-oe-g++/qmake.conf
+++ b/mkspecs/qws/linux-oe-g++/qmake.conf
@@ -10,10 +10,10 @@ CONFIG += qt link_prl
STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin
STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin
-STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include
-STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib
+STAGING_INCDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/include $(OEDIR)/tmp/staging/$(OETARGETSYS)/include/freetype2/include
+STAGING_LIBDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/lib
-QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc
+QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-gcc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
@@ -27,7 +27,7 @@ QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
QMAKE_CFLAGS_THREAD = -D_REENTRANT
-QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM
+QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
@@ -48,8 +48,8 @@ QMAKE_LIBDIR_OPENGL =
QMAKE_INCDIR_QTOPIA =
QMAKE_LIBDIR_QTOPIA =
-QMAKE_LINK = $$STAGING_CROSSDIR/arm-linux-g++
-QMAKE_LINK_SHLIB = $$STAGING_CROSSDIR/arm-linux-g++
+QMAKE_LINK = $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
+QMAKE_LINK_SHLIB = $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
QMAKE_LFLAGS = $(LFLAGS_EXTRA)
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =