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
@@ -12,24 +12,25 @@ ifneq ($(wildcard $(TOPDIR)/.config),)
12endif 12endif
13 13
14ifndef CONFIG_TARGET_OE 14ifndef CONFIG_TARGET_OE
15 ifndef QTDIR 15 ifndef QTDIR
16 $(error QTDIR not set) 16 $(error QTDIR not set)
17 endif 17 endif
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
30 PLATFORM=sharp-linux 31 PLATFORM=sharp-linux
31endif 32endif
32ifdef CONFIG_TARGET_IPAQ 33ifdef CONFIG_TARGET_IPAQ
33 PLATFORM=ipaq-linux 34 PLATFORM=ipaq-linux
34endif 35endif
35ifdef CONFIG_TARGET_RAMSES 36ifdef CONFIG_TARGET_RAMSES
diff --git a/config.in b/config.in
index d9659be..323ca51 100644
--- a/config.in
+++ b/config.in
@@ -33,24 +33,29 @@ choice
33 config TARGET_SIMPAD 33 config TARGET_SIMPAD
34 boolean "SIMpad" 34 boolean "SIMpad"
35 35
36 config TARGET_YOPY 36 config TARGET_YOPY
37 boolean "Yopy 3500/3700" 37 boolean "Yopy 3500/3700"
38endchoice 38endchoice
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"
51 default "n" 56 default "n"
52 57
53config STATIC 58config STATIC
54 boolean "Build static libraries" 59 boolean "Build static libraries"
55 default "n" 60 default "n"
56 61
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
@@ -1,23 +1,23 @@
1# 1#
2# $Id$ 2# $Id$
3# 3#
4# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler 4# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
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
18 QMAKE_LEXFLAGS = 18 QMAKE_LEXFLAGS =
19 QMAKE_YACC = yacc 19 QMAKE_YACC = yacc
20 QMAKE_YACCFLAGS = -d 20 QMAKE_YACCFLAGS = -d
21 QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) 21 QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)
22 QMAKE_CFLAGS_WARN_ON= -Wall -W 22 QMAKE_CFLAGS_WARN_ON= -Wall -W
23 QMAKE_CFLAGS_WARN_OFF= 23 QMAKE_CFLAGS_WARN_OFF=