|
diff --git a/Vars.make b/Vars.make index 6a52a93..880ccf1 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -15,32 +15,35 @@ 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 |
@@ -100,32 +103,35 @@ ifeq ($(QTE_VERSION),) |
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 |
|
|
diff --git a/config.in b/config.in index 61107e7..e979966 100644 --- a/ config.in+++ b/ config.in |
|
@@ -22,32 +22,36 @@ choice |
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" |
|