summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make1
-rw-r--r--config.in5
-rw-r--r--mkspecs/qws/linux-oe-g++/qmake.conf2
3 files changed, 7 insertions, 1 deletions
diff --git a/Vars.make b/Vars.make
index 238918f..fe4f397 100644
--- a/Vars.make
+++ b/Vars.make
@@ -18,12 +18,13 @@ ifndef CONFIG_TARGET_OE
18else 18else
19 OEDIR:=$(CONFIG_OE_BUILD_DIR) 19 OEDIR:=$(CONFIG_OE_BUILD_DIR)
20 QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 20 QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2
21 $(shell mkdir -p $(QTDIR)/src/moc) 21 $(shell mkdir -p $(QTDIR)/src/moc)
22 $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) 22 $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile)
23 PLATFORM=sharp-linux 23 PLATFORM=sharp-linux
24 OEHOSTSYS:=$(CONFIG_OE_HOST_SYS)
24endif 25endif
25 26
26ifdef CONFIG_TARGET_X86 27ifdef CONFIG_TARGET_X86
27 PLATFORM=x86-linux 28 PLATFORM=x86-linux
28endif 29endif
29ifdef CONFIG_TARGET_SHARP 30ifdef CONFIG_TARGET_SHARP
diff --git a/config.in b/config.in
index d9659be..323ca51 100644
--- a/config.in
+++ b/config.in
@@ -39,12 +39,17 @@ endchoice
39 39
40config OE_BUILD_DIR 40config OE_BUILD_DIR
41 depends TARGET_OE 41 depends TARGET_OE
42 string "OE build directory" 42 string "OE build directory"
43 default ">>>set OpenEmbedded build directory here<<<" 43 default ">>>set OpenEmbedded build directory here<<<"
44 44
45config OE_HOST_SYS
46 depends TARGET_OE
47 string "OE host system"
48 default "i686-linux"
49
45config OPTIMIZE 50config OPTIMIZE
46 boolean "Use optimizations" 51 boolean "Use optimizations"
47 default "y" if ! TARGET_X86 52 default "y" if ! TARGET_X86
48 53
49config THREADED 54config THREADED
50 boolean "Enable threaded build" 55 boolean "Enable threaded build"
diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf
index c4c273f..90166b0 100644
--- a/mkspecs/qws/linux-oe-g++/qmake.conf
+++ b/mkspecs/qws/linux-oe-g++/qmake.conf
@@ -5,13 +5,13 @@
5# 5#
6 6
7 MAKEFILE_GENERATOR= UNIX 7 MAKEFILE_GENERATOR= UNIX
8 TEMPLATE = app 8 TEMPLATE = app
9 CONFIG += qt link_prl 9 CONFIG += qt link_prl
10 10
11STAGING_BINDIR = $(OEDIR)/tmp/staging/i686-linux/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 13STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include
14STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib 14STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib
15 15
16 QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc 16 QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc
17 QMAKE_LEX = flex 17 QMAKE_LEX = flex