summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make5
-rw-r--r--config.in5
-rw-r--r--mkspecs/qws/linux-oe-g++/qmake.conf12
3 files changed, 14 insertions, 8 deletions
diff --git a/Vars.make b/Vars.make
index 1413282..6a52a93 100644
--- a/Vars.make
+++ b/Vars.make
@@ -18,9 +18,10 @@ ifndef CONFIG_TARGET_OE
18else 18else
19 OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g') 19 OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g')
20 QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/arm-linux/qt2 20 OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
21 OETARGETSYS:=$(shell echo $(CONFIG_OE_TARGET_SYS) | sed -e's/"//g')
22 QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/$(OETARGETSYS)/qt2
21 $(shell mkdir -p $(QTDIR)/src/moc) 23 $(shell mkdir -p $(QTDIR)/src/moc)
22 $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) 24 $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile)
23 PLATFORM=sharp-linux 25 PLATFORM=sharp-linux
24 OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
25endif 26endif
26 27
diff --git a/config.in b/config.in
index f913aad..e9ffed2 100644
--- a/config.in
+++ b/config.in
@@ -47,4 +47,9 @@ config OE_HOST_SYS
47 string "OE host system" 47 string "OE host system"
48 default "i686-linux" 48 default "i686-linux"
49
50config OE_TARGET_SYS
51 depends TARGET_OE
52 string "OE target system"
53 default "arm-linux"
49 54
50config OPTIMIZE 55config OPTIMIZE
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
@@ -11,8 +11,8 @@ CONFIG += qt link_prl
11STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin 11STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin
12STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin 12STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin
13STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include 13STAGING_INCDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/include $(OEDIR)/tmp/staging/$(OETARGETSYS)/include/freetype2/include
14STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib 14STAGING_LIBDIR = $(OEDIR)/tmp/staging/$(OETARGETSYS)/lib
15 15
16 QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc 16 QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-gcc
17 QMAKE_LEX = flex 17 QMAKE_LEX = flex
18 QMAKE_LEXFLAGS = 18 QMAKE_LEXFLAGS =
@@ -28,5 +28,5 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
28 QMAKE_CFLAGS_THREAD= -D_REENTRANT 28 QMAKE_CFLAGS_THREAD= -D_REENTRANT
29 29
30 QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM 30 QMAKE_CXX = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/$(OETARGETSYS)-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM
31 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) 31 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
32 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON 32 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
@@ -49,6 +49,6 @@ QMAKE_INCDIR_QTOPIA =
49 QMAKE_LIBDIR_QTOPIA= 49 QMAKE_LIBDIR_QTOPIA=
50 50
51 QMAKE_LINK = $$STAGING_CROSSDIR/arm-linux-g++ 51 QMAKE_LINK = $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
52 QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/arm-linux-g++ 52 QMAKE_LINK_SHLIB= $$STAGING_CROSSDIR/$(OETARGETSYS)-g++
53 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 53 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
54 QMAKE_LFLAGS_RELEASE= 54 QMAKE_LFLAGS_RELEASE=