|
diff --git a/Vars.make b/Vars.make index eac5cea..b1cdb28 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -2,24 +2,28 @@ 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),) |
| |
15 | include $(TOPDIR)/.config |
| |
16 | endif |
| |
17 | |
14 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
18 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
15 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
19 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
16 | |
20 | |
17 | ifeq ($(QPE_VERSION),) |
21 | ifeq ($(QPE_VERSION),) |
18 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
22 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
19 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
23 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
20 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
24 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
21 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
25 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
22 | |
26 | |
23 | ifeq ($(QPE_VERSION),..) |
27 | ifeq ($(QPE_VERSION),..) |
24 | QPE_VERSION=0.9.3 |
28 | QPE_VERSION=0.9.3 |
25 | endif |
29 | endif |
@@ -52,12 +56,30 @@ endif |
52 | export QTE_BASEVERSION |
56 | export QTE_BASEVERSION |
53 | |
57 | |
54 | ifeq ($(QTE_VERSION),) |
58 | ifeq ($(QTE_VERSION),) |
55 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
59 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
56 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
60 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
57 | else |
61 | else |
58 | QTE_VERSION=2.3.5 |
62 | QTE_VERSION=2.3.5 |
59 | endif |
63 | endif |
60 | endif |
64 | endif |
61 | export QTE_VERSION |
65 | export QTE_VERSION |
62 | |
66 | |
63 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
67 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
| |
68 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
| |
69 | |
| |
70 | ifdef CONFIG_OPTIMIZATIONS |
| |
71 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
| |
72 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
| |
73 | endif |
| |
74 | |
| |
75 | ifeq ($(STRIP),) |
| |
76 | ifneq ($(CONFIG_TARGET_X86),) |
| |
77 | STRIP=strip |
| |
78 | endif |
| |
79 | ifneq ($(CONFIG_TARGET_IPAQ),) |
| |
80 | STRIP=arm-linux-strip |
| |
81 | endif |
| |
82 | ifneq ($(CONFIG_TARGET_SHARP),) |
| |
83 | STRIP=arm-linux-strip |
| |
84 | endif |
| |
85 | endif |
|