-rw-r--r-- | Vars.make | 1 | ||||
-rw-r--r-- | config.in | 5 | ||||
-rw-r--r-- | mkspecs/qws/linux-oe-g++/qmake.conf | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -18,12 +18,13 @@ ifndef CONFIG_TARGET_OE | |||
18 | else | 18 | else |
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) | ||
24 | endif | 25 | endif |
25 | 26 | ||
26 | ifdef CONFIG_TARGET_X86 | 27 | ifdef CONFIG_TARGET_X86 |
27 | PLATFORM=x86-linux | 28 | PLATFORM=x86-linux |
28 | endif | 29 | endif |
29 | ifdef CONFIG_TARGET_SHARP | 30 | ifdef CONFIG_TARGET_SHARP |
@@ -39,12 +39,17 @@ endchoice | |||
39 | 39 | ||
40 | config OE_BUILD_DIR | 40 | config 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 | ||
45 | config OE_HOST_SYS | ||
46 | depends TARGET_OE | ||
47 | string "OE host system" | ||
48 | default "i686-linux" | ||
49 | |||
45 | config OPTIMIZE | 50 | config OPTIMIZE |
46 | boolean "Use optimizations" | 51 | boolean "Use optimizations" |
47 | default "y" if ! TARGET_X86 | 52 | default "y" if ! TARGET_X86 |
48 | 53 | ||
49 | config THREADED | 54 | config 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 | ||
11 | STAGING_BINDIR = $(OEDIR)/tmp/staging/i686-linux/bin | 11 | STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin |
12 | STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin | 12 | STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin |
13 | STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include | 13 | STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include |
14 | STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib | 14 | STAGING_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 |