summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make8
1 files changed, 4 insertions, 4 deletions
diff --git a/Vars.make b/Vars.make
index 1a5d9d4..a58801e 100644
--- a/Vars.make
+++ b/Vars.make
@@ -27,87 +27,87 @@ endif
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 34ifdef CONFIG_TARGET_YOPY
35 PLATFORM=yopy-linux 35 PLATFORM=yopy-linux
36endif 36endif
37ifdef CONFIG_TARGET_MACOSX 37ifdef CONFIG_TARGET_MACOSX
38 PLATFORM=macx-darwin 38 PLATFORM=macx-darwin
39endif 39endif
40 40
41export QMAKE:=$(OPIEDIR)/qmake/qmake 41export QMAKE:=$(OPIEDIR)/qmake/qmake
42export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 42export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
43 43
44ifeq ($(QPE_VERSION),) 44ifeq ($(QPE_VERSION),)
45 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))
46 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))
47 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))
48 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) 48 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
49 49
50 ifeq ($(QPE_VERSION),..) 50 ifeq ($(QPE_VERSION),..)
51 QPE_VERSION=0.9.3 51 QPE_VERSION=1.1.0
52 endif 52 endif
53endif 53endif
54export QPE_VERSION 54export QPE_VERSION
55 55
56SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 56SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
57ifeq ($(VERSION_CVS),) 57ifeq ($(VERSION_CVS),)
58 VERSION_CVS:=$(shell date +%Y%m%d) 58 VERSION_CVS:=$(shell date +%Y%m%d)
59endif 59endif
60ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 60ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
61 SUB_VERSION:=$(VERSION_CVS) 61 SUB_VERSION:=$(VERSION_CVS)
62endif 62endif
63export SUB_VERSION 63export SUB_VERSION
64 64
65ifneq ($(strip $(SUB_VERSION)),) 65ifneq ($(strip $(SUB_VERSION)),)
66EXTRAVERSION=-$(SUB_VERSION) 66EXTRAVERSION=-$(SUB_VERSION)
67endif 67endif
68 68
69ifeq ($(QTE_REVISION),) 69ifeq ($(QTE_REVISION),)
70 QTE_REVISION=5 70 QTE_REVISION=6
71endif 71endif
72export QTE_REVISION 72export QTE_REVISION
73 73
74export DEB_VERSION=2.0 74export DEB_VERSION=2.0
75 75
76ifeq ($(QTE_BASEVERSION),) 76ifeq ($(QTE_BASEVERSION),)
77 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 77 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
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/;') 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/;')
79 else 79 else
80 QTE_BASEVERSION=2.3.5 80 QTE_BASEVERSION=2.3.7
81 endif 81 endif
82endif 82endif
83export QTE_BASEVERSION 83export QTE_BASEVERSION
84 84
85ifeq ($(QTE_VERSION),) 85ifeq ($(QTE_VERSION),)
86 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 86 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
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/;') 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/;')
88 else 88 else
89 QTE_VERSION=2.3.5 89 QTE_VERSION=2.3.7
90 endif 90 endif
91endif 91endif
92export QTE_VERSION 92export QTE_VERSION
93 93
94export PATH:=$(OPIEDIR)/scripts:$(PATH) 94export PATH:=$(OPIEDIR)/scripts:$(PATH)
95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
96 96
97ifdef CONFIG_OPTIMIZATIONS 97ifdef CONFIG_OPTIMIZATIONS
98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
100endif 100endif
101 101
102ifeq ($(STRIP),) 102ifeq ($(STRIP),)
103 ifneq ($(CONFIG_TARGET_X86),) 103 ifneq ($(CONFIG_TARGET_X86),)
104 STRIP=strip 104 STRIP=strip
105 endif 105 endif
106 ifneq ($(CONFIG_TARGET_IPAQ),) 106 ifneq ($(CONFIG_TARGET_IPAQ),)
107 STRIP=arm-linux-strip 107 STRIP=arm-linux-strip
108 endif 108 endif
109 ifneq ($(CONFIG_TARGET_SHARP),) 109 ifneq ($(CONFIG_TARGET_SHARP),)
110 STRIP=arm-linux-strip 110 STRIP=arm-linux-strip
111 endif 111 endif
112 ifneq ($(CONFIG_TARGET_RAMSES),) 112 ifneq ($(CONFIG_TARGET_RAMSES),)
113 STRIP=arm-linux-strip 113 STRIP=arm-linux-strip