|
diff --git a/Vars.make b/Vars.make index eac5cea..b1cdb28 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -8,12 +8,16 @@ 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)) |
@@ -58,6 +62,24 @@ ifeq ($(QTE_VERSION),) |
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 |
|