summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-02-12 15:47:06 (UTC)
committer mickeyl <mickeyl>2005-02-12 15:47:06 (UTC)
commit0bf0f893a82426615cfe9f0bf764e1344c733ee3 (patch) (unidiff)
treeba147bb8ea70b409f15a76196097de49056576b6
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 (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
@@ -1,131 +1,132 @@
1prefix=/opt/QtPalmtop 1prefix=/opt/QtPalmtop
2 2
3ifeq ($(OPIEDIR),) 3ifeq ($(OPIEDIR),)
4 export OPIEDIR:=$(TOPDIR) 4 export OPIEDIR:=$(TOPDIR)
5endif 5endif
6ifeq ($(IPK_DIR),) 6ifeq ($(IPK_DIR),)
7 export IPK_DIR:=$(OPIEDIR) 7 export IPK_DIR:=$(OPIEDIR)
8endif 8endif
9 9
10ifneq ($(wildcard $(TOPDIR)/.config),) 10ifneq ($(wildcard $(TOPDIR)/.config),)
11 include $(TOPDIR)/.config 11 include $(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:=$(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
27ifdef CONFIG_TARGET_X86 28ifdef CONFIG_TARGET_X86
28 PLATFORM=x86-linux 29 PLATFORM=x86-linux
29endif 30endif
30ifdef CONFIG_TARGET_SHARP 31ifdef CONFIG_TARGET_SHARP
31 PLATFORM=sharp-linux 32 PLATFORM=sharp-linux
32endif 33endif
33ifdef CONFIG_TARGET_IPAQ 34ifdef CONFIG_TARGET_IPAQ
34 PLATFORM=ipaq-linux 35 PLATFORM=ipaq-linux
35endif 36endif
36ifdef CONFIG_TARGET_RAMSES 37ifdef CONFIG_TARGET_RAMSES
37 PLATFORM=ramses-linux 38 PLATFORM=ramses-linux
38endif 39endif
39ifdef CONFIG_TARGET_SIMPAD 40ifdef CONFIG_TARGET_SIMPAD
40 PLATFORM=simpad-linux 41 PLATFORM=simpad-linux
41endif 42endif
42 43
43ifdef CONFIG_TARGET_YOPY 44ifdef CONFIG_TARGET_YOPY
44 PLATFORM=yopy-linux 45 PLATFORM=yopy-linux
45endif 46endif
46ifdef CONFIG_TARGET_MACOSX 47ifdef CONFIG_TARGET_MACOSX
47 PLATFORM=macx-darwin 48 PLATFORM=macx-darwin
48endif 49endif
49 50
50export QMAKE:=$(OPIEDIR)/qmake/qmake 51export QMAKE:=$(OPIEDIR)/qmake/qmake
51export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 52export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
52 53
53ifeq ($(QPE_VERSION),) 54ifeq ($(QPE_VERSION),)
54 VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) 55 VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
55 VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) 56 VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
56 VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) 57 VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h))
57 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) 58 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
58 59
59 ifeq ($(QPE_VERSION),..) 60 ifeq ($(QPE_VERSION),..)
60 QPE_VERSION=1.1.2 61 QPE_VERSION=1.1.2
61 endif 62 endif
62endif 63endif
63export QPE_VERSION 64export QPE_VERSION
64 65
65SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 66SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
66ifeq ($(VERSION_CVS),) 67ifeq ($(VERSION_CVS),)
67 VERSION_CVS:=$(shell date +%s) 68 VERSION_CVS:=$(shell date +%s)
68endif 69endif
69ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 70ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
70 SUB_VERSION:=$(VERSION_CVS) 71 SUB_VERSION:=$(VERSION_CVS)
71endif 72endif
72export SUB_VERSION 73export SUB_VERSION
73 74
74ifneq ($(strip $(SUB_VERSION)),) 75ifneq ($(strip $(SUB_VERSION)),)
75EXTRAVERSION=-$(SUB_VERSION) 76EXTRAVERSION=-$(SUB_VERSION)
76endif 77endif
77 78
78ifeq ($(QTE_REVISION),) 79ifeq ($(QTE_REVISION),)
79 QTE_REVISION=6 80 QTE_REVISION=6
80endif 81endif
81export QTE_REVISION 82export QTE_REVISION
82 83
83export DEB_VERSION=2.0 84export DEB_VERSION=2.0
84 85
85ifeq ($(QTE_BASEVERSION),) 86ifeq ($(QTE_BASEVERSION),)
86 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 87 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
87 QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') 88 QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
88 else 89 else
89 QTE_BASEVERSION=2.3.7 90 QTE_BASEVERSION=2.3.7
90 endif 91 endif
91endif 92endif
92export QTE_BASEVERSION 93export QTE_BASEVERSION
93 94
94ifeq ($(QTE_VERSION),) 95ifeq ($(QTE_VERSION),)
95 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 96 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
96 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') 97 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
97 else 98 else
98 QTE_VERSION=2.3.7 99 QTE_VERSION=2.3.7
99 endif 100 endif
100endif 101endif
101export QTE_VERSION 102export QTE_VERSION
102 103
103export PATH:=$(OPIEDIR)/scripts:$(PATH) 104export PATH:=$(OPIEDIR)/scripts:$(PATH)
104export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 105export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
105 106
106ifdef CONFIG_OPTIMIZATIONS 107ifdef CONFIG_OPTIMIZATIONS
107export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 108export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
108export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 109export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
109endif 110endif
110 111
111ifeq ($(STRIP),) 112ifeq ($(STRIP),)
112 ifneq ($(CONFIG_TARGET_X86),) 113 ifneq ($(CONFIG_TARGET_X86),)
113 STRIP=strip 114 STRIP=strip
114 endif 115 endif
115 ifneq ($(CONFIG_TARGET_IPAQ),) 116 ifneq ($(CONFIG_TARGET_IPAQ),)
116 STRIP=arm-linux-strip 117 STRIP=arm-linux-strip
117 endif 118 endif
118 ifneq ($(CONFIG_TARGET_SHARP),) 119 ifneq ($(CONFIG_TARGET_SHARP),)
119 STRIP=arm-linux-strip 120 STRIP=arm-linux-strip
120 endif 121 endif
121 ifneq ($(CONFIG_TARGET_RAMSES),) 122 ifneq ($(CONFIG_TARGET_RAMSES),)
122 STRIP=arm-linux-strip 123 STRIP=arm-linux-strip
123 endif 124 endif
124 ifneq ($(CONFIG_TARGET_SIMPAD),) 125 ifneq ($(CONFIG_TARGET_SIMPAD),)
125 STRIP=arm-linux-strip 126 STRIP=arm-linux-strip
126 endif 127 endif
127 ifneq ($(CONFIG_TARGET_YOPY),) 128 ifneq ($(CONFIG_TARGET_YOPY),)
128 STRIP=arm-linux-strip 129 STRIP=arm-linux-strip
129 endif 130 endif
130endif 131endif
131 132
diff --git a/config.in b/config.in
index f913aad..e9ffed2 100644
--- a/config.in
+++ b/config.in
@@ -1,176 +1,181 @@
1mainmenu "Opie Configuration" 1mainmenu "Opie Configuration"
2 2
3menu "Build Parameters" 3menu "Build Parameters"
4 4
5choice 5choice
6 prompt "Target Machine" 6 prompt "Target Machine"
7 default TARGET_X86 7 default TARGET_X86
8 help 8 help
9 Please select the architecture of the machine you will be 9 Please select the architecture of the machine you will be
10 building the OpenZaurus buildroot for. 10 building the OpenZaurus buildroot for.
11 11
12 config TARGET_X86 12 config TARGET_X86
13 boolean "Intel X86" 13 boolean "Intel X86"
14 14
15 config TARGET_MACOSX 15 config TARGET_MACOSX
16 boolean "Mac OS X (DARWIN)" 16 boolean "Mac OS X (DARWIN)"
17 17
18 config TARGET_SHARP 18 config TARGET_SHARP
19 boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)" 19 boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)"
20 20
21 config TARGET_C700 21 config TARGET_C700
22 boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)" 22 boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)"
23 23
24 config TARGET_OE 24 config TARGET_OE
25 boolean "OpenEmbedded w/ OE build dir set below" 25 boolean "OpenEmbedded w/ OE build dir set below"
26 26
27 config TARGET_IPAQ 27 config TARGET_IPAQ
28 boolean "iPAQ" 28 boolean "iPAQ"
29 29
30 config TARGET_RAMSES 30 config TARGET_RAMSES
31 boolean "Ramses" 31 boolean "Ramses"
32 32
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 45config OE_HOST_SYS
46 depends TARGET_OE 46 depends TARGET_OE
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
51 boolean "Use optimizations" 56 boolean "Use optimizations"
52 default "y" if ! TARGET_X86 57 default "y" if ! TARGET_X86
53 58
54config THREADED 59config THREADED
55 boolean "Enable threaded build" 60 boolean "Enable threaded build"
56 default "n" 61 default "n"
57 62
58config STATIC 63config STATIC
59 boolean "Build static libraries" 64 boolean "Build static libraries"
60 default "n" 65 default "n"
61 66
62config DEBUG 67config DEBUG
63 boolean "Enable debug builds" 68 boolean "Enable debug builds"
64 default n 69 default n
65 70
66config RELEASE 71config RELEASE
67 bool 72 bool
68 default y 73 default y
69 depends !DEBUG 74 depends !DEBUG
70 75
71config QUICK_LAUNCH 76config QUICK_LAUNCH
72 boolean "Enable Quick Launch" 77 boolean "Enable Quick Launch"
73 default n if TARGET_X86 78 default n if TARGET_X86
74 default y if ! TARGET_X86 79 default y if ! TARGET_X86
75 80
76config QUICKLAUNCH_PATH 81config QUICKLAUNCH_PATH
77 string "Path to quicklauncher" 82 string "Path to quicklauncher"
78 default "./quicklauncher" if TARGET_X86 83 default "./quicklauncher" if TARGET_X86
79 default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86 84 default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
80 85
81config SPECFILE 86config SPECFILE
82 string 87 string
83 default "qws/linux-generic-g++" if TARGET_X86 && (! X11) 88 default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
84 default "linux-g++" if TARGET_X86 && X11 89 default "linux-g++" if TARGET_X86 && X11
85 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) 90 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
86 default "linux-g++" if TARGET_SHARP && X11 91 default "linux-g++" if TARGET_SHARP && X11
87 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) 92 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
88 default "linux-g++" if TARGET_IPAQ && X11 93 default "linux-g++" if TARGET_IPAQ && X11
89 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) 94 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
90 default "linux-g++" if TARGET_RAMSES && X11 95 default "linux-g++" if TARGET_RAMSES && X11
91 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) 96 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
92 default "linux-g++" if TARGET_SIMPAD && X11 97 default "linux-g++" if TARGET_SIMPAD && X11
93 default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) 98 default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
94 default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) 99 default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
95 default "qws/linux-oe-g++" if TARGET_OE && (!X11) 100 default "qws/linux-oe-g++" if TARGET_OE && (!X11)
96 101
97config CUSTOMFILE 102config CUSTOMFILE
98 string 103 string
99 default "custom-ipaq.h" if TARGET_IPAQ 104 default "custom-ipaq.h" if TARGET_IPAQ
100 default "custom-sharp.h" if TARGET_SHARP 105 default "custom-sharp.h" if TARGET_SHARP
101 default "custom-ramses.h" if TARGET_RAMSES 106 default "custom-ramses.h" if TARGET_RAMSES
102 default "custom-ipaq.h" if TARGET_SIMPAD 107 default "custom-ipaq.h" if TARGET_SIMPAD
103 default "custom-yopy.h" if TARGET_YOPY 108 default "custom-yopy.h" if TARGET_YOPY
104 109
105config OPTIMIZATIONS 110config OPTIMIZATIONS
106 string "Optimization flags" 111 string "Optimization flags"
107 depends OPTIMIZE 112 depends OPTIMIZE
108 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ 113 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
109 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY 114 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY
110 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP 115 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
111 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES 116 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
112 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD 117 default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
113 default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700 118 default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700
114 119
115config EXPERIMENTAL 120config EXPERIMENTAL
116 bool "Prompt for development and/or incomplete items" 121 bool "Prompt for development and/or incomplete items"
117 default y 122 default y
118 123
119config USE_CCACHE 124config USE_CCACHE
120 bool "Use ccache, if available?" 125 bool "Use ccache, if available?"
121 default y 126 default y
122 127
123endmenu 128endmenu
124 129
125menu "Configuration" 130menu "Configuration"
126config OPIE_NO_BUILTIN_SHUTDOWN 131config OPIE_NO_BUILTIN_SHUTDOWN
127 boolean "Disable the built in shutdown application" 132 boolean "Disable the built in shutdown application"
128 default y 133 default y
129 134
130config OPIE_NO_BUILTIN_CALIBRATE 135config OPIE_NO_BUILTIN_CALIBRATE
131 boolean "Disable the built in calibrate application" 136 boolean "Disable the built in calibrate application"
132 default y if TARGET_YOPY 137 default y if TARGET_YOPY
133 default n if ! TARGET_YOPY 138 default n if ! TARGET_YOPY
134 139
135config OPIE_SOUND_FRAGMENT_SHIFT 140config OPIE_SOUND_FRAGMENT_SHIFT
136 string "The sound fragment used in Opie Player I" 141 string "The sound fragment used in Opie Player I"
137 default "14" if TARGET_IPAQ 142 default "14" if TARGET_IPAQ
138 default "16" if ! TARGET_IPAQ 143 default "16" if ! TARGET_IPAQ
139 144
140config USE_REALTIME_AUDIO_THREAD 145config USE_REALTIME_AUDIO_THREAD
141 boolean "Use a realtime thread in Opie Player I" 146 boolean "Use a realtime thread in Opie Player I"
142 default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP 147 default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP
143 default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP) 148 default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
144 149
145config QT_QWS_ALLOW_OVERCLOCK 150config QT_QWS_ALLOW_OVERCLOCK
146 boolean "Allow the user to overclock the device" 151 boolean "Allow the user to overclock the device"
147 depends TARGET_RAMSES 152 depends TARGET_RAMSES
148 default n 153 default n
149 154
150config USE_FILE_NOTIFICATION 155config USE_FILE_NOTIFICATION
151 boolean "Substitute (some) polling interfaces with OFileNotifier" 156 boolean "Substitute (some) polling interfaces with OFileNotifier"
152 default y 157 default y
153 158
154config OPIE_NEW_ALLOC 159config OPIE_NEW_ALLOC
155 boolean "Use malloc and free for the implementation" 160 boolean "Use malloc and free for the implementation"
156 default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP 161 default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
157 default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP) 162 default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
158 163
159config OPIE_TASKBAR_LOCK_KEY_STATE 164config OPIE_TASKBAR_LOCK_KEY_STATE
160 boolean "Have a KeyLock state indicator on the taskbar" 165 boolean "Have a KeyLock state indicator on the taskbar"
161 default y if TARGET_SHARP 166 default y if TARGET_SHARP
162 default n if !TARGET_SHARP 167 default n if !TARGET_SHARP
163 168
164config LIBQPE_WITHROHFEEDBACK 169config LIBQPE_WITHROHFEEDBACK
165 boolean "Build libqpe with Right-On-Hold feedback" 170 boolean "Build libqpe with Right-On-Hold feedback"
166 default y 171 default y
167 172
168config OPIE_NO_SOUND_PCM_READ_BITS 173config OPIE_NO_SOUND_PCM_READ_BITS
169 boolean "There is not a pcm_read_bits io control" 174 boolean "There is not a pcm_read_bits io control"
170 default y if TARGET_SHARP 175 default y if TARGET_SHARP
171 default n if ! TARGET_SHARP 176 default n if ! TARGET_SHARP
172endmenu 177endmenu
173 178
174menu "Dependencies" 179menu "Dependencies"
175 source dependencies.in 180 source dependencies.in
176endmenu 181endmenu
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
@@ -1,86 +1,86 @@
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/$(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 =
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=
24 QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) 24 QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
25 QMAKE_CFLAGS_DEBUG= -g 25 QMAKE_CFLAGS_DEBUG= -g
26 QMAKE_CFLAGS_SHLIB= -fPIC 26 QMAKE_CFLAGS_SHLIB= -fPIC
27 QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses 27 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
33 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF 33 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
34 QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE 34 QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
35 QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG 35 QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
36 QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB 36 QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
37 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC 37 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
38 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD 38 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
39 39
40 QMAKE_INCDIR = $$STAGING_INCDIR 40 QMAKE_INCDIR = $$STAGING_INCDIR
41 QMAKE_LIBDIR = $$STAGING_LIBDIR 41 QMAKE_LIBDIR = $$STAGING_LIBDIR
42 QMAKE_INCDIR_X11= 42 QMAKE_INCDIR_X11=
43 QMAKE_LIBDIR_X11= 43 QMAKE_LIBDIR_X11=
44 QMAKE_INCDIR_QT = $(QTDIR)/include 44 QMAKE_INCDIR_QT = $(QTDIR)/include
45 QMAKE_LIBDIR_QT = $(QTDIR)/lib 45 QMAKE_LIBDIR_QT = $(QTDIR)/lib
46 QMAKE_INCDIR_OPENGL= 46 QMAKE_INCDIR_OPENGL=
47 QMAKE_LIBDIR_OPENGL= 47 QMAKE_LIBDIR_OPENGL=
48 QMAKE_INCDIR_QTOPIA= 48 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=
55 QMAKE_LFLAGS_DEBUG= 55 QMAKE_LFLAGS_DEBUG=
56QMAKE_LFLAGS_SHLIB = -shared 56QMAKE_LFLAGS_SHLIB = -shared
57QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 57QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
58QMAKE_LFLAGS_SONAME = -Wl,-soname, 58QMAKE_LFLAGS_SONAME = -Wl,-soname,
59QMAKE_LFLAGS_THREAD = 59QMAKE_LFLAGS_THREAD =
60QMAKE_RPATH = -Wl,-rpath-link, 60QMAKE_RPATH = -Wl,-rpath-link,
61 61
62 QMAKE_LIBS = $(LIBS_EXTRA) 62 QMAKE_LIBS = $(LIBS_EXTRA)
63QMAKE_LIBS_DYNLOAD = -ldl 63QMAKE_LIBS_DYNLOAD = -ldl
64 QMAKE_LIBS_X11 = 64 QMAKE_LIBS_X11 =
65 QMAKE_LIBS_X11SM= 65 QMAKE_LIBS_X11SM=
66 QMAKE_LIBS_QT = -lqte 66 QMAKE_LIBS_QT = -lqte
67QMAKE_LIBS_QT_THREAD = -lqte-mt 67QMAKE_LIBS_QT_THREAD = -lqte-mt
68 QMAKE_LIBS_QT_OPENGL= -lqgl 68 QMAKE_LIBS_QT_OPENGL= -lqgl
69 QMAKE_LIBS_QTOPIA= -lqpe 69 QMAKE_LIBS_QTOPIA= -lqpe
70QMAKE_LIBS_THREAD = -lpthread 70QMAKE_LIBS_THREAD = -lpthread
71 71
72 QMAKE_MOC = $$STAGING_BINDIR/moc 72 QMAKE_MOC = $$STAGING_BINDIR/moc
73 QMAKE_UIC = $$STAGING_BINDIR/uic 73 QMAKE_UIC = $$STAGING_BINDIR/uic
74 74
75 QMAKE_AR = ar cqs 75 QMAKE_AR = ar cqs
76 QMAKE_RANLIB = 76 QMAKE_RANLIB =
77 77
78 QMAKE_TAR = tar -cf 78 QMAKE_TAR = tar -cf
79 QMAKE_GZIP = gzip -9f 79 QMAKE_GZIP = gzip -9f
80 80
81 QMAKE_COPY = cp -f 81 QMAKE_COPY = cp -f
82 QMAKE_MOVE = mv -f 82 QMAKE_MOVE = mv -f
83 QMAKE_DEL_FILE = rm -f 83 QMAKE_DEL_FILE = rm -f
84 QMAKE_DEL_DIR = rmdir 84 QMAKE_DEL_DIR = rmdir
85 QMAKE_CHK_DIR_EXISTS= test -d 85 QMAKE_CHK_DIR_EXISTS= test -d
86 QMAKE_MKDIR = mkdir -p 86 QMAKE_MKDIR = mkdir -p