|
diff --git a/Vars.make b/Vars.make index 6a52a93..880ccf1 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -1,132 +1,138 @@ |
1 | prefix=/opt/QtPalmtop |
1 | prefix=/opt/QtPalmtop |
2 | |
2 | |
3 | ifeq ($(OPIEDIR),) |
3 | ifeq ($(OPIEDIR),) |
4 | export OPIEDIR:=$(TOPDIR) |
4 | export OPIEDIR:=$(TOPDIR) |
5 | endif |
5 | endif |
6 | ifeq ($(IPK_DIR),) |
6 | ifeq ($(IPK_DIR),) |
7 | export IPK_DIR:=$(OPIEDIR) |
7 | export IPK_DIR:=$(OPIEDIR) |
8 | endif |
8 | endif |
9 | |
9 | |
10 | ifneq ($(wildcard $(TOPDIR)/.config),) |
10 | ifneq ($(wildcard $(TOPDIR)/.config),) |
11 | include $(TOPDIR)/.config |
11 | include $(TOPDIR)/.config |
12 | endif |
12 | endif |
13 | |
13 | |
14 | ifndef CONFIG_TARGET_OE |
14 | ifndef CONFIG_TARGET_OE |
15 | ifndef QTDIR |
15 | ifndef QTDIR |
16 | $(error QTDIR not set) |
16 | $(error QTDIR not set) |
17 | endif |
17 | endif |
18 | else |
18 | else |
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 | OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g') |
20 | OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g') |
21 | OETARGETSYS:=$(shell echo $(CONFIG_OE_TARGET_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 |
22 | QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/$(OETARGETSYS)/qt2 |
23 | $(shell mkdir -p $(QTDIR)/src/moc) |
23 | $(shell mkdir -p $(QTDIR)/src/moc) |
24 | $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) |
24 | $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) |
25 | PLATFORM=sharp-linux |
25 | PLATFORM=sharp-linux |
26 | endif |
26 | endif |
27 | |
27 | |
28 | ifdef CONFIG_TARGET_X86 |
28 | ifdef CONFIG_TARGET_X86 |
29 | PLATFORM=x86-linux |
29 | PLATFORM=x86-linux |
30 | endif |
30 | endif |
| |
31 | ifdef CONFIG_TARGET_64BIT |
| |
32 | PLATFORM=64-linux |
| |
33 | endif |
31 | ifdef CONFIG_TARGET_SHARP |
34 | ifdef CONFIG_TARGET_SHARP |
32 | PLATFORM=sharp-linux |
35 | PLATFORM=sharp-linux |
33 | endif |
36 | endif |
34 | ifdef CONFIG_TARGET_IPAQ |
37 | ifdef CONFIG_TARGET_IPAQ |
35 | PLATFORM=ipaq-linux |
38 | PLATFORM=ipaq-linux |
36 | endif |
39 | endif |
37 | ifdef CONFIG_TARGET_RAMSES |
40 | ifdef CONFIG_TARGET_RAMSES |
38 | PLATFORM=ramses-linux |
41 | PLATFORM=ramses-linux |
39 | endif |
42 | endif |
40 | ifdef CONFIG_TARGET_SIMPAD |
43 | ifdef CONFIG_TARGET_SIMPAD |
41 | PLATFORM=simpad-linux |
44 | PLATFORM=simpad-linux |
42 | endif |
45 | endif |
43 | |
46 | |
44 | ifdef CONFIG_TARGET_YOPY |
47 | ifdef CONFIG_TARGET_YOPY |
45 | PLATFORM=yopy-linux |
48 | PLATFORM=yopy-linux |
46 | endif |
49 | endif |
47 | ifdef CONFIG_TARGET_MACOSX |
50 | ifdef CONFIG_TARGET_MACOSX |
48 | PLATFORM=macx-darwin |
51 | PLATFORM=macx-darwin |
49 | endif |
52 | endif |
50 | |
53 | |
51 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
54 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
52 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
55 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
53 | |
56 | |
54 | ifeq ($(QPE_VERSION),) |
57 | ifeq ($(QPE_VERSION),) |
55 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
58 | VERSION_MAJ:=$(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)) |
59 | VERSION_MIN:=$(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)) |
60 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
58 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
61 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
59 | |
62 | |
60 | ifeq ($(QPE_VERSION),..) |
63 | ifeq ($(QPE_VERSION),..) |
61 | QPE_VERSION=1.1.2 |
64 | QPE_VERSION=1.1.2 |
62 | endif |
65 | endif |
63 | endif |
66 | endif |
64 | export QPE_VERSION |
67 | export QPE_VERSION |
65 | |
68 | |
66 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
69 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
67 | ifeq ($(VERSION_CVS),) |
70 | ifeq ($(VERSION_CVS),) |
68 | VERSION_CVS:=$(shell date +%s) |
71 | VERSION_CVS:=$(shell date +%s) |
69 | endif |
72 | endif |
70 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
73 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
71 | SUB_VERSION:=$(VERSION_CVS) |
74 | SUB_VERSION:=$(VERSION_CVS) |
72 | endif |
75 | endif |
73 | export SUB_VERSION |
76 | export SUB_VERSION |
74 | |
77 | |
75 | ifneq ($(strip $(SUB_VERSION)),) |
78 | ifneq ($(strip $(SUB_VERSION)),) |
76 | EXTRAVERSION=-$(SUB_VERSION) |
79 | EXTRAVERSION=-$(SUB_VERSION) |
77 | endif |
80 | endif |
78 | |
81 | |
79 | ifeq ($(QTE_REVISION),) |
82 | ifeq ($(QTE_REVISION),) |
80 | QTE_REVISION=6 |
83 | QTE_REVISION=6 |
81 | endif |
84 | endif |
82 | export QTE_REVISION |
85 | export QTE_REVISION |
83 | |
86 | |
84 | export DEB_VERSION=2.0 |
87 | export DEB_VERSION=2.0 |
85 | |
88 | |
86 | ifeq ($(QTE_BASEVERSION),) |
89 | ifeq ($(QTE_BASEVERSION),) |
87 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
90 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
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/;') |
91 | 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/;') |
89 | else |
92 | else |
90 | QTE_BASEVERSION=2.3.7 |
93 | QTE_BASEVERSION=2.3.7 |
91 | endif |
94 | endif |
92 | endif |
95 | endif |
93 | export QTE_BASEVERSION |
96 | export QTE_BASEVERSION |
94 | |
97 | |
95 | ifeq ($(QTE_VERSION),) |
98 | ifeq ($(QTE_VERSION),) |
96 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
99 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
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/;') |
100 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
98 | else |
101 | else |
99 | QTE_VERSION=2.3.7 |
102 | QTE_VERSION=2.3.7 |
100 | endif |
103 | endif |
101 | endif |
104 | endif |
102 | export QTE_VERSION |
105 | export QTE_VERSION |
103 | |
106 | |
104 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
107 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
105 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
108 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
106 | |
109 | |
107 | ifdef CONFIG_OPTIMIZATIONS |
110 | ifdef CONFIG_OPTIMIZATIONS |
108 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
111 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
109 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
112 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
110 | endif |
113 | endif |
111 | |
114 | |
112 | ifeq ($(STRIP),) |
115 | ifeq ($(STRIP),) |
113 | ifneq ($(CONFIG_TARGET_X86),) |
116 | ifneq ($(CONFIG_TARGET_X86),) |
114 | STRIP=strip |
117 | STRIP=strip |
115 | endif |
118 | endif |
| |
119 | ifneq ($(CONFIG_TARGET_64BIT),) |
| |
120 | STRIP=strip |
| |
121 | endif |
116 | ifneq ($(CONFIG_TARGET_IPAQ),) |
122 | ifneq ($(CONFIG_TARGET_IPAQ),) |
117 | STRIP=arm-linux-strip |
123 | STRIP=arm-linux-strip |
118 | endif |
124 | endif |
119 | ifneq ($(CONFIG_TARGET_SHARP),) |
125 | ifneq ($(CONFIG_TARGET_SHARP),) |
120 | STRIP=arm-linux-strip |
126 | STRIP=arm-linux-strip |
121 | endif |
127 | endif |
122 | ifneq ($(CONFIG_TARGET_RAMSES),) |
128 | ifneq ($(CONFIG_TARGET_RAMSES),) |
123 | STRIP=arm-linux-strip |
129 | STRIP=arm-linux-strip |
124 | endif |
130 | endif |
125 | ifneq ($(CONFIG_TARGET_SIMPAD),) |
131 | ifneq ($(CONFIG_TARGET_SIMPAD),) |
126 | STRIP=arm-linux-strip |
132 | STRIP=arm-linux-strip |
127 | endif |
133 | endif |
128 | ifneq ($(CONFIG_TARGET_YOPY),) |
134 | ifneq ($(CONFIG_TARGET_YOPY),) |
129 | STRIP=arm-linux-strip |
135 | STRIP=arm-linux-strip |
130 | endif |
136 | endif |
131 | endif |
137 | endif |
132 | |
138 | |
|
|
diff --git a/config.in b/config.in index 61107e7..e979966 100644 --- a/ config.in+++ b/ config.in |
|
@@ -1,101 +1,105 @@ |
1 | mainmenu "Opie Configuration" |
1 | mainmenu "Opie Configuration" |
2 | |
2 | |
3 | menu "Build Parameters" |
3 | menu "Build Parameters" |
4 | |
4 | |
5 | choice |
5 | choice |
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" |
| |
38 | |
| |
39 | config TARGET_64BIT |
| |
40 | boolean "64 BIT" |
| |
41 | |
38 | endchoice |
42 | endchoice |
39 | |
43 | |
40 | config OE_BUILD_DIR |
44 | config OE_BUILD_DIR |
41 | depends TARGET_OE |
45 | depends TARGET_OE |
42 | string "OE build directory" |
46 | string "OE build directory" |
43 | default ">>>set OpenEmbedded build directory here<<<" |
47 | default ">>>set OpenEmbedded build directory here<<<" |
44 | |
48 | |
45 | config OE_HOST_SYS |
49 | config OE_HOST_SYS |
46 | depends TARGET_OE |
50 | depends TARGET_OE |
47 | string "OE host system" |
51 | string "OE host system" |
48 | default "i686-linux" |
52 | default "i686-linux" |
49 | |
53 | |
50 | config OE_TARGET_SYS |
54 | config OE_TARGET_SYS |
51 | depends TARGET_OE |
55 | depends TARGET_OE |
52 | string "OE target system" |
56 | string "OE target system" |
53 | default "arm-linux" |
57 | default "arm-linux" |
54 | |
58 | |
55 | config OPTIMIZE |
59 | config OPTIMIZE |
56 | boolean "Use optimizations" |
60 | boolean "Use optimizations" |
57 | default "y" if ! TARGET_X86 |
61 | default "y" if ! TARGET_X86 |
58 | |
62 | |
59 | config THREADED |
63 | config THREADED |
60 | boolean "Enable threaded build" |
64 | boolean "Enable threaded build" |
61 | default "n" |
65 | default "n" |
62 | |
66 | |
63 | config STATIC |
67 | config STATIC |
64 | boolean "Build static libraries" |
68 | boolean "Build static libraries" |
65 | default "n" |
69 | default "n" |
66 | |
70 | |
67 | config DEBUG |
71 | config DEBUG |
68 | boolean "Enable debug builds" |
72 | boolean "Enable debug builds" |
69 | default n |
73 | default n |
70 | |
74 | |
71 | config RELEASE |
75 | config RELEASE |
72 | bool |
76 | bool |
73 | default y |
77 | default y |
74 | depends !DEBUG |
78 | depends !DEBUG |
75 | |
79 | |
76 | config QUICK_LAUNCH |
80 | config QUICK_LAUNCH |
77 | boolean "Enable Quick Launch" |
81 | boolean "Enable Quick Launch" |
78 | default n if TARGET_X86 |
82 | default n if TARGET_X86 |
79 | default y if ! TARGET_X86 |
83 | default y if ! TARGET_X86 |
80 | |
84 | |
81 | config QUICKLAUNCH_PATH |
85 | config QUICKLAUNCH_PATH |
82 | string "Path to quicklauncher" |
86 | string "Path to quicklauncher" |
83 | default "./quicklauncher" if TARGET_X86 |
87 | default "./quicklauncher" if TARGET_X86 |
84 | default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86 |
88 | default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86 |
85 | |
89 | |
86 | config SPECFILE |
90 | config SPECFILE |
87 | string |
91 | string |
88 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) |
92 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) |
89 | default "linux-g++" if TARGET_X86 && X11 |
93 | default "linux-g++" if TARGET_X86 && X11 |
90 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) |
94 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) |
91 | default "linux-g++" if TARGET_SHARP && X11 |
95 | default "linux-g++" if TARGET_SHARP && X11 |
92 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) |
96 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) |
93 | default "linux-g++" if TARGET_IPAQ && X11 |
97 | default "linux-g++" if TARGET_IPAQ && X11 |
94 | default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) |
98 | default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) |
95 | default "linux-g++" if TARGET_RAMSES && X11 |
99 | default "linux-g++" if TARGET_RAMSES && X11 |
96 | default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) |
100 | default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) |
97 | default "linux-g++" if TARGET_SIMPAD && X11 |
101 | default "linux-g++" if TARGET_SIMPAD && X11 |
98 | default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) |
102 | default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) |
99 | default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) |
103 | default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) |
100 | default "qws/linux-oe-g++" if TARGET_OE && (!X11) |
104 | default "qws/linux-oe-g++" if TARGET_OE && (!X11) |
101 | |
105 | |
|