|
diff --git a/Vars.make b/Vars.make index ae54661..062094c 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -1,100 +1,103 @@ |
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 |
34 | ifdef CONFIG_TARGET_YOPY |
35 | PLATFORM=yopy-linux |
35 | PLATFORM=yopy-linux |
36 | endif |
36 | endif |
| |
37 | ifdef CONFIG_TARGET_MACOSX |
| |
38 | PLATFORM=macx-darwin |
| |
39 | endif |
37 | |
40 | |
38 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
41 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
39 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
42 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
40 | |
43 | |
41 | ifeq ($(QPE_VERSION),) |
44 | ifeq ($(QPE_VERSION),) |
42 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
45 | VERSION_MAJ:=$(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)) |
46 | VERSION_MIN:=$(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)) |
47 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
45 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
48 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
46 | |
49 | |
47 | ifeq ($(QPE_VERSION),..) |
50 | ifeq ($(QPE_VERSION),..) |
48 | QPE_VERSION=0.9.3 |
51 | QPE_VERSION=0.9.3 |
49 | endif |
52 | endif |
50 | endif |
53 | endif |
51 | export QPE_VERSION |
54 | export QPE_VERSION |
52 | |
55 | |
53 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
56 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
54 | ifeq ($(VERSION_CVS),) |
57 | ifeq ($(VERSION_CVS),) |
55 | VERSION_CVS:=$(shell date +%Y%m%d) |
58 | VERSION_CVS:=$(shell date +%Y%m%d) |
56 | endif |
59 | endif |
57 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
60 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
58 | SUB_VERSION:=$(VERSION_CVS) |
61 | SUB_VERSION:=$(VERSION_CVS) |
59 | endif |
62 | endif |
60 | export SUB_VERSION |
63 | export SUB_VERSION |
61 | |
64 | |
62 | ifneq ($(strip $(SUB_VERSION)),) |
65 | ifneq ($(strip $(SUB_VERSION)),) |
63 | EXTRAVERSION=-$(SUB_VERSION) |
66 | EXTRAVERSION=-$(SUB_VERSION) |
64 | endif |
67 | endif |
65 | |
68 | |
66 | ifeq ($(QTE_REVISION),) |
69 | ifeq ($(QTE_REVISION),) |
67 | QTE_REVISION=5 |
70 | QTE_REVISION=5 |
68 | endif |
71 | endif |
69 | export QTE_REVISION |
72 | export QTE_REVISION |
70 | |
73 | |
71 | export DEB_VERSION=2.0 |
74 | export DEB_VERSION=2.0 |
72 | |
75 | |
73 | ifeq ($(QTE_BASEVERSION),) |
76 | ifeq ($(QTE_BASEVERSION),) |
74 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
77 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
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/;') |
78 | 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/;') |
76 | else |
79 | else |
77 | QTE_BASEVERSION=2.3.5 |
80 | QTE_BASEVERSION=2.3.5 |
78 | endif |
81 | endif |
79 | endif |
82 | endif |
80 | export QTE_BASEVERSION |
83 | export QTE_BASEVERSION |
81 | |
84 | |
82 | ifeq ($(QTE_VERSION),) |
85 | ifeq ($(QTE_VERSION),) |
83 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
86 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
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/;') |
87 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
85 | else |
88 | else |
86 | QTE_VERSION=2.3.5 |
89 | QTE_VERSION=2.3.5 |
87 | endif |
90 | endif |
88 | endif |
91 | endif |
89 | export QTE_VERSION |
92 | export QTE_VERSION |
90 | |
93 | |
91 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
94 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
92 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
95 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
93 | |
96 | |
94 | ifdef CONFIG_OPTIMIZATIONS |
97 | ifdef CONFIG_OPTIMIZATIONS |
95 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
98 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
96 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
99 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
97 | endif |
100 | endif |
98 | |
101 | |
99 | ifeq ($(STRIP),) |
102 | ifeq ($(STRIP),) |
100 | ifneq ($(CONFIG_TARGET_X86),) |
103 | ifneq ($(CONFIG_TARGET_X86),) |
|