summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Vars.make7
-rw-r--r--config.in6
2 files changed, 13 insertions, 0 deletions
diff --git a/Vars.make b/Vars.make
index 59766d1..ae54661 100644
--- a/Vars.make
+++ b/Vars.make
@@ -10,48 +10,52 @@ endif
10ifeq ($(IPK_DIR),) 10ifeq ($(IPK_DIR),)
11 export IPK_DIR:=$(OPIEDIR) 11 export IPK_DIR:=$(OPIEDIR)
12endif 12endif
13 13
14ifneq ($(wildcard $(TOPDIR)/.config),) 14ifneq ($(wildcard $(TOPDIR)/.config),)
15 include $(TOPDIR)/.config 15 include $(TOPDIR)/.config
16endif 16endif
17 17
18ifdef CONFIG_TARGET_X86 18ifdef CONFIG_TARGET_X86
19 PLATFORM=x86-linux 19 PLATFORM=x86-linux
20endif 20endif
21ifdef CONFIG_TARGET_SHARP 21ifdef CONFIG_TARGET_SHARP
22 PLATFORM=sharp-linux 22 PLATFORM=sharp-linux
23endif 23endif
24ifdef CONFIG_TARGET_IPAQ 24ifdef CONFIG_TARGET_IPAQ
25 PLATFORM=ipaq-linux 25 PLATFORM=ipaq-linux
26endif 26endif
27ifdef CONFIG_TARGET_RAMSES 27ifdef CONFIG_TARGET_RAMSES
28 PLATFORM=ramses-linux 28 PLATFORM=ramses-linux
29endif 29endif
30ifdef CONFIG_TARGET_SIMPAD 30ifdef CONFIG_TARGET_SIMPAD
31 PLATFORM=simpad-linux 31 PLATFORM=simpad-linux
32endif 32endif
33 33
34ifdef CONFIG_TARGET_YOPY
35 PLATFORM=yopy-linux
36endif
37
34export QMAKE:=$(OPIEDIR)/qmake/qmake 38export QMAKE:=$(OPIEDIR)/qmake/qmake
35export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 39export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
36 40
37ifeq ($(QPE_VERSION),) 41ifeq ($(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
46endif 50endif
47export QPE_VERSION 51export QPE_VERSION
48 52
49SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 53SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
50ifeq ($(VERSION_CVS),) 54ifeq ($(VERSION_CVS),)
51 VERSION_CVS:=$(shell date +%Y%m%d) 55 VERSION_CVS:=$(shell date +%Y%m%d)
52endif 56endif
53ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 57ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
54 SUB_VERSION:=$(VERSION_CVS) 58 SUB_VERSION:=$(VERSION_CVS)
55endif 59endif
56export SUB_VERSION 60export SUB_VERSION
57 61
@@ -87,25 +91,28 @@ export QTE_VERSION
87export PATH:=$(OPIEDIR)/scripts:$(PATH) 91export PATH:=$(OPIEDIR)/scripts:$(PATH)
88export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 92export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
89 93
90ifdef CONFIG_OPTIMIZATIONS 94ifdef CONFIG_OPTIMIZATIONS
91export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 95export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
92export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 96export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
93endif 97endif
94 98
95ifeq ($(STRIP),) 99ifeq ($(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
111endif 118endif
diff --git a/config.in b/config.in
index ddbc93b..4db0204 100644
--- a/config.in
+++ b/config.in
@@ -3,94 +3,100 @@ mainmenu "Opie Configuration"
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_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
27endchoice 30endchoice
28 31
29config OPTIMIZE 32config OPTIMIZE
30 boolean "Use optimizations" 33 boolean "Use optimizations"
31 default "y" if ! TARGET_X86 34 default "y" if ! TARGET_X86
32 35
33config DEBUG 36config DEBUG
34 boolean "Enable debug builds" 37 boolean "Enable debug builds"
35 default n 38 default n
36config RELEASE 39config RELEASE
37 bool 40 bool
38 default y 41 default y
39 depends !DEBUG 42 depends !DEBUG
40 43
41config QUICK_LAUNCH 44config QUICK_LAUNCH
42 boolean "Enable Quick Launch" 45 boolean "Enable Quick Launch"
43 default n 46 default n
44 47
45config OPIE_NO_OVERRIDE_QT 48config 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
49config SPECFILE 52config 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
62config CUSTOMFILE 66config 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
69config OPTIMIZATIONS 74config 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
77config EXPERIMENTAL 83config 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
81endmenu 87endmenu
82 88
83menu "Base" 89menu "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
95endmenu 101endmenu
96 102