author | ocheong <ocheong> | 2003-10-09 10:30:28 (UTC) |
---|---|---|
committer | ocheong <ocheong> | 2003-10-09 10:30:28 (UTC) |
commit | 67f75e91f3fa7f21df2e19749a6ad53e9d237f8b (patch) (unidiff) | |
tree | 95431614d89df018e1ad45d5b55c8b69652f548d | |
parent | f8d08db59ac05f5bf2f56e6ebf69c28dfbe8b13e (diff) | |
download | opie-67f75e91f3fa7f21df2e19749a6ad53e9d237f8b.zip opie-67f75e91f3fa7f21df2e19749a6ad53e9d237f8b.tar.gz opie-67f75e91f3fa7f21df2e19749a6ad53e9d237f8b.tar.bz2 |
Added Yopy to build system.
-rw-r--r-- | Vars.make | 7 | ||||
-rw-r--r-- | config.in | 6 |
2 files changed, 13 insertions, 0 deletions
@@ -1,111 +1,118 @@ | |||
1 | ifndef QTDIR | 1 | ifndef QTDIR |
2 | $(error QTDIR not set) | 2 | $(error QTDIR not set) |
3 | endif | 3 | endif |
4 | 4 | ||
5 | prefix=/opt/QtPalmtop | 5 | prefix=/opt/QtPalmtop |
6 | 6 | ||
7 | ifeq ($(OPIEDIR),) | 7 | ifeq ($(OPIEDIR),) |
8 | export OPIEDIR:=$(TOPDIR) | 8 | export OPIEDIR:=$(TOPDIR) |
9 | endif | 9 | endif |
10 | ifeq ($(IPK_DIR),) | 10 | ifeq ($(IPK_DIR),) |
11 | export IPK_DIR:=$(OPIEDIR) | 11 | export IPK_DIR:=$(OPIEDIR) |
12 | endif | 12 | endif |
13 | 13 | ||
14 | ifneq ($(wildcard $(TOPDIR)/.config),) | 14 | ifneq ($(wildcard $(TOPDIR)/.config),) |
15 | include $(TOPDIR)/.config | 15 | include $(TOPDIR)/.config |
16 | endif | 16 | endif |
17 | 17 | ||
18 | ifdef CONFIG_TARGET_X86 | 18 | ifdef CONFIG_TARGET_X86 |
19 | PLATFORM=x86-linux | 19 | PLATFORM=x86-linux |
20 | endif | 20 | endif |
21 | ifdef CONFIG_TARGET_SHARP | 21 | ifdef CONFIG_TARGET_SHARP |
22 | PLATFORM=sharp-linux | 22 | PLATFORM=sharp-linux |
23 | endif | 23 | endif |
24 | ifdef CONFIG_TARGET_IPAQ | 24 | ifdef CONFIG_TARGET_IPAQ |
25 | PLATFORM=ipaq-linux | 25 | PLATFORM=ipaq-linux |
26 | endif | 26 | endif |
27 | ifdef CONFIG_TARGET_RAMSES | 27 | ifdef CONFIG_TARGET_RAMSES |
28 | PLATFORM=ramses-linux | 28 | PLATFORM=ramses-linux |
29 | endif | 29 | endif |
30 | ifdef CONFIG_TARGET_SIMPAD | 30 | ifdef CONFIG_TARGET_SIMPAD |
31 | PLATFORM=simpad-linux | 31 | PLATFORM=simpad-linux |
32 | endif | 32 | endif |
33 | 33 | ||
34 | ifdef CONFIG_TARGET_YOPY | ||
35 | PLATFORM=yopy-linux | ||
36 | endif | ||
37 | |||
34 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 38 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
35 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 39 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
36 | 40 | ||
37 | ifeq ($(QPE_VERSION),) | 41 | ifeq ($(QPE_VERSION),) |
38 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 42 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
39 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 43 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
40 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) | 44 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
41 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) | 45 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
42 | 46 | ||
43 | ifeq ($(QPE_VERSION),..) | 47 | ifeq ($(QPE_VERSION),..) |
44 | QPE_VERSION=0.9.3 | 48 | QPE_VERSION=0.9.3 |
45 | endif | 49 | endif |
46 | endif | 50 | endif |
47 | export QPE_VERSION | 51 | export QPE_VERSION |
48 | 52 | ||
49 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) | 53 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
50 | ifeq ($(VERSION_CVS),) | 54 | ifeq ($(VERSION_CVS),) |
51 | VERSION_CVS:=$(shell date +%Y%m%d) | 55 | VERSION_CVS:=$(shell date +%Y%m%d) |
52 | endif | 56 | endif |
53 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) | 57 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
54 | SUB_VERSION:=$(VERSION_CVS) | 58 | SUB_VERSION:=$(VERSION_CVS) |
55 | endif | 59 | endif |
56 | export SUB_VERSION | 60 | export SUB_VERSION |
57 | 61 | ||
58 | ifneq ($(strip $(SUB_VERSION)),) | 62 | ifneq ($(strip $(SUB_VERSION)),) |
59 | EXTRAVERSION=-$(SUB_VERSION) | 63 | EXTRAVERSION=-$(SUB_VERSION) |
60 | endif | 64 | endif |
61 | 65 | ||
62 | ifeq ($(QTE_REVISION),) | 66 | ifeq ($(QTE_REVISION),) |
63 | QTE_REVISION=5 | 67 | QTE_REVISION=5 |
64 | endif | 68 | endif |
65 | export QTE_REVISION | 69 | export QTE_REVISION |
66 | 70 | ||
67 | export DEB_VERSION=2.0 | 71 | export DEB_VERSION=2.0 |
68 | 72 | ||
69 | ifeq ($(QTE_BASEVERSION),) | 73 | ifeq ($(QTE_BASEVERSION),) |
70 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 74 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
71 | 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/;') | 75 | 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/;') |
72 | else | 76 | else |
73 | QTE_BASEVERSION=2.3.5 | 77 | QTE_BASEVERSION=2.3.5 |
74 | endif | 78 | endif |
75 | endif | 79 | endif |
76 | export QTE_BASEVERSION | 80 | export QTE_BASEVERSION |
77 | 81 | ||
78 | ifeq ($(QTE_VERSION),) | 82 | ifeq ($(QTE_VERSION),) |
79 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 83 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
80 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') | 84 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
81 | else | 85 | else |
82 | QTE_VERSION=2.3.5 | 86 | QTE_VERSION=2.3.5 |
83 | endif | 87 | endif |
84 | endif | 88 | endif |
85 | export QTE_VERSION | 89 | export QTE_VERSION |
86 | 90 | ||
87 | export PATH:=$(OPIEDIR)/scripts:$(PATH) | 91 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
88 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) | 92 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
89 | 93 | ||
90 | ifdef CONFIG_OPTIMIZATIONS | 94 | ifdef CONFIG_OPTIMIZATIONS |
91 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) | 95 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
92 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) | 96 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
93 | endif | 97 | endif |
94 | 98 | ||
95 | ifeq ($(STRIP),) | 99 | ifeq ($(STRIP),) |
96 | ifneq ($(CONFIG_TARGET_X86),) | 100 | ifneq ($(CONFIG_TARGET_X86),) |
97 | STRIP=strip | 101 | STRIP=strip |
98 | endif | 102 | endif |
99 | ifneq ($(CONFIG_TARGET_IPAQ),) | 103 | ifneq ($(CONFIG_TARGET_IPAQ),) |
100 | STRIP=arm-linux-strip | 104 | STRIP=arm-linux-strip |
101 | endif | 105 | endif |
102 | ifneq ($(CONFIG_TARGET_SHARP),) | 106 | ifneq ($(CONFIG_TARGET_SHARP),) |
103 | STRIP=arm-linux-strip | 107 | STRIP=arm-linux-strip |
104 | endif | 108 | endif |
105 | ifneq ($(CONFIG_TARGET_RAMSES),) | 109 | ifneq ($(CONFIG_TARGET_RAMSES),) |
106 | STRIP=arm-linux-strip | 110 | STRIP=arm-linux-strip |
107 | endif | 111 | endif |
108 | ifneq ($(CONFIG_TARGET_SIMPAD),) | 112 | ifneq ($(CONFIG_TARGET_SIMPAD),) |
109 | STRIP=arm-linux-strip | 113 | STRIP=arm-linux-strip |
110 | endif | 114 | endif |
115 | ifneq ($(CONFIG_TARGET_YOPY),) | ||
116 | STRIP=arm-linux-strip | ||
117 | endif | ||
111 | endif | 118 | endif |
@@ -1,136 +1,142 @@ | |||
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_SHARP | 15 | config TARGET_SHARP |
16 | boolean "Sharp Zaurus" | 16 | boolean "Sharp Zaurus" |
17 | 17 | ||
18 | config TARGET_IPAQ | 18 | config TARGET_IPAQ |
19 | boolean "iPAQ" | 19 | boolean "iPAQ" |
20 | 20 | ||
21 | config TARGET_RAMSES | 21 | config TARGET_RAMSES |
22 | boolean "Ramses" | 22 | boolean "Ramses" |
23 | 23 | ||
24 | config TARGET_SIMPAD | 24 | config TARGET_SIMPAD |
25 | boolean "SIMpad" | 25 | boolean "SIMpad" |
26 | 26 | ||
27 | config TARGET_YOPY | ||
28 | boolean "Yopy 3500/3700" | ||
29 | |||
27 | endchoice | 30 | endchoice |
28 | 31 | ||
29 | config OPTIMIZE | 32 | config OPTIMIZE |
30 | boolean "Use optimizations" | 33 | boolean "Use optimizations" |
31 | default "y" if ! TARGET_X86 | 34 | default "y" if ! TARGET_X86 |
32 | 35 | ||
33 | config DEBUG | 36 | config DEBUG |
34 | boolean "Enable debug builds" | 37 | boolean "Enable debug builds" |
35 | default n | 38 | default n |
36 | config RELEASE | 39 | config RELEASE |
37 | bool | 40 | bool |
38 | default y | 41 | default y |
39 | depends !DEBUG | 42 | depends !DEBUG |
40 | 43 | ||
41 | config QUICK_LAUNCH | 44 | config QUICK_LAUNCH |
42 | boolean "Enable Quick Launch" | 45 | boolean "Enable Quick Launch" |
43 | default n | 46 | default n |
44 | 47 | ||
45 | config OPIE_NO_OVERRIDE_QT | 48 | config OPIE_NO_OVERRIDE_QT |
46 | boolean "Build Opie against an unpatched version of Qt" | 49 | boolean "Build Opie against an unpatched version of Qt" |
47 | default n | 50 | default n |
48 | 51 | ||
49 | config SPECFILE | 52 | config SPECFILE |
50 | string | 53 | string |
51 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) | 54 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) |
52 | default "linux-g++" if TARGET_X86 && X11 | 55 | default "linux-g++" if TARGET_X86 && X11 |
53 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) | 56 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) |
54 | default "linux-g++" if TARGET_SHARP && X11 | 57 | default "linux-g++" if TARGET_SHARP && X11 |
55 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) | 58 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) |
56 | default "linux-g++" if TARGET_IPAQ && X11 | 59 | default "linux-g++" if TARGET_IPAQ && X11 |
57 | default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) | 60 | default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) |
58 | default "linux-g++" if TARGET_RAMSES && X11 | 61 | default "linux-g++" if TARGET_RAMSES && X11 |
59 | default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) | 62 | default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) |
60 | default "linux-g++" if TARGET_SIMPAD && X11 | 63 | default "linux-g++" if TARGET_SIMPAD && X11 |
64 | default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) | ||
61 | 65 | ||
62 | config CUSTOMFILE | 66 | config CUSTOMFILE |
63 | string | 67 | string |
64 | default "custom-ipaq.h" if TARGET_IPAQ | 68 | default "custom-ipaq.h" if TARGET_IPAQ |
65 | default "custom-sharp.h" if TARGET_SHARP | 69 | default "custom-sharp.h" if TARGET_SHARP |
66 | default "custom-ramses.h" if TARGET_RAMSES | 70 | default "custom-ramses.h" if TARGET_RAMSES |
67 | default "custom-ipaq.h" if TARGET_SIMPAD | 71 | default "custom-ipaq.h" if TARGET_SIMPAD |
72 | default "custom-yopy.h" if TARGET_YOPY | ||
68 | 73 | ||
69 | config OPTIMIZATIONS | 74 | config OPTIMIZATIONS |
70 | string "Optimization flags" | 75 | string "Optimization flags" |
71 | depends OPTIMIZE | 76 | depends OPTIMIZE |
72 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ | 77 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ |
78 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY | ||
73 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP | 79 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP |
74 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES | 80 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES |
75 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD | 81 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD |
76 | 82 | ||
77 | config EXPERIMENTAL | 83 | config EXPERIMENTAL |
78 | bool "Prompt for development and/or incomplete items" | 84 | bool "Prompt for development and/or incomplete items" |
79 | default y | 85 | default y |
80 | 86 | ||
81 | endmenu | 87 | endmenu |
82 | 88 | ||
83 | menu "Base" | 89 | menu "Base" |
84 | choice | 90 | choice |
85 | prompt "Qpe Library Selection" | 91 | prompt "Qpe Library Selection" |
86 | default LIBQPE | 92 | default LIBQPE |
87 | source library/config.in | 93 | source library/config.in |
88 | source x11/config.in | 94 | source x11/config.in |
89 | endchoice | 95 | endchoice |
90 | source libopie/config.in | 96 | source libopie/config.in |
91 | source core/opie-login/config.in | 97 | source core/opie-login/config.in |
92 | source core/opiealarm/config.in | 98 | source core/opiealarm/config.in |
93 | source core/launcher/config.in | 99 | source core/launcher/config.in |
94 | source core/qws/config.in | 100 | source core/qws/config.in |
95 | endmenu | 101 | endmenu |
96 | 102 | ||
97 | comment "" | 103 | comment "" |
98 | 104 | ||
99 | menu "Applets" | 105 | menu "Applets" |
100 | source core/applets/config.in | 106 | source core/applets/config.in |
101 | source noncore/applets/config.in | 107 | source noncore/applets/config.in |
102 | endmenu | 108 | endmenu |
103 | 109 | ||
104 | menu "Apps" | 110 | menu "Apps" |
105 | source core/apps/config.in | 111 | source core/apps/config.in |
106 | source noncore/apps/config.in | 112 | source noncore/apps/config.in |
107 | endmenu | 113 | endmenu |
108 | 114 | ||
109 | menu "Communications and Networking" | 115 | menu "Communications and Networking" |
110 | source noncore/comm/config.in | 116 | source noncore/comm/config.in |
111 | source noncore/mail/config.in | 117 | source noncore/mail/config.in |
112 | source noncore/net/config.in | 118 | source noncore/net/config.in |
113 | endmenu | 119 | endmenu |
114 | 120 | ||
115 | menu "Games" | 121 | menu "Games" |
116 | source noncore/games/config.in | 122 | source noncore/games/config.in |
117 | endmenu | 123 | endmenu |
118 | 124 | ||
119 | menu "Graphics and Multimedia" | 125 | menu "Graphics and Multimedia" |
120 | source freetype/config.in | 126 | source freetype/config.in |
121 | source noncore/graphics/config.in | 127 | source noncore/graphics/config.in |
122 | source core/multimedia/config.in | 128 | source core/multimedia/config.in |
123 | source noncore/multimedia/config.in | 129 | source noncore/multimedia/config.in |
124 | endmenu | 130 | endmenu |
125 | 131 | ||
126 | menu "Input methods" | 132 | menu "Input methods" |
127 | source inputmethods/config.in | 133 | source inputmethods/config.in |
128 | endmenu | 134 | endmenu |
129 | 135 | ||
130 | menu "Pim" | 136 | menu "Pim" |
131 | source core/pim/config.in | 137 | source core/pim/config.in |
132 | menu "Today Plugins" | 138 | menu "Today Plugins" |
133 | source noncore/todayplugins/config.in | 139 | source noncore/todayplugins/config.in |
134 | source core/pim/today/plugins/config.in | 140 | source core/pim/today/plugins/config.in |
135 | endmenu | 141 | endmenu |
136 | endmenu | 142 | endmenu |