summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-11-08 23:47:39 (UTC)
committer llornkcor <llornkcor>2005-11-08 23:47:39 (UTC)
commit432e2165e5117f4fce78570d83518f1b8ca8f02b (patch) (unidiff)
tree75415c1747db2961cc1fc5fe1a9bd47da3a9d83d
parent6bd52d3658f01c966d690b12235592a5473a4d57 (diff)
downloadopie-432e2165e5117f4fce78570d83518f1b8ca8f02b.zip
opie-432e2165e5117f4fce78570d83518f1b8ca8f02b.tar.gz
opie-432e2165e5117f4fce78570d83518f1b8ca8f02b.tar.bz2
also add 64bit here
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/Vars.make b/Vars.make
index 880ccf1..b99da70 100644
--- a/Vars.make
+++ b/Vars.make
@@ -1,128 +1,128 @@
1prefix=/opt/QtPalmtop 1prefix=/opt/QtPalmtop
2 2
3ifeq ($(OPIEDIR),) 3ifeq ($(OPIEDIR),)
4 export OPIEDIR:=$(TOPDIR) 4 export OPIEDIR:=$(TOPDIR)
5endif 5endif
6ifeq ($(IPK_DIR),) 6ifeq ($(IPK_DIR),)
7 export IPK_DIR:=$(OPIEDIR) 7 export IPK_DIR:=$(OPIEDIR)
8endif 8endif
9 9
10ifneq ($(wildcard $(TOPDIR)/.config),) 10ifneq ($(wildcard $(TOPDIR)/.config),)
11 include $(TOPDIR)/.config 11 include $(TOPDIR)/.config
12endif 12endif
13 13
14ifndef CONFIG_TARGET_OE 14ifndef CONFIG_TARGET_OE
15 ifndef QTDIR 15 ifndef QTDIR
16 $(error QTDIR not set) 16 $(error QTDIR not set)
17 endif 17 endif
18else 18else
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
26endif 26endif
27 27
28ifdef CONFIG_TARGET_X86 28ifdef CONFIG_TARGET_X86
29 PLATFORM=x86-linux 29 PLATFORM=x86-linux
30endif 30endif
31ifdef CONFIG_TARGET_64BIT 31ifdef CONFIG_TARGET_64BIT
32 PLATFORM=64-linux 32 PLATFORM=64bit-linux
33endif 33endif
34ifdef CONFIG_TARGET_SHARP 34ifdef CONFIG_TARGET_SHARP
35 PLATFORM=sharp-linux 35 PLATFORM=sharp-linux
36endif 36endif
37ifdef CONFIG_TARGET_IPAQ 37ifdef CONFIG_TARGET_IPAQ
38 PLATFORM=ipaq-linux 38 PLATFORM=ipaq-linux
39endif 39endif
40ifdef CONFIG_TARGET_RAMSES 40ifdef CONFIG_TARGET_RAMSES
41 PLATFORM=ramses-linux 41 PLATFORM=ramses-linux
42endif 42endif
43ifdef CONFIG_TARGET_SIMPAD 43ifdef CONFIG_TARGET_SIMPAD
44 PLATFORM=simpad-linux 44 PLATFORM=simpad-linux
45endif 45endif
46 46
47ifdef CONFIG_TARGET_YOPY 47ifdef CONFIG_TARGET_YOPY
48 PLATFORM=yopy-linux 48 PLATFORM=yopy-linux
49endif 49endif
50ifdef CONFIG_TARGET_MACOSX 50ifdef CONFIG_TARGET_MACOSX
51 PLATFORM=macx-darwin 51 PLATFORM=macx-darwin
52endif 52endif
53 53
54export QMAKE:=$(OPIEDIR)/qmake/qmake 54export QMAKE:=$(OPIEDIR)/qmake/qmake
55export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 55export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
56 56
57ifeq ($(QPE_VERSION),) 57ifeq ($(QPE_VERSION),)
58 VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) 58 VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
59 VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) 59 VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
60 VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) 60 VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h))
61 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) 61 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
62 62
63 ifeq ($(QPE_VERSION),..) 63 ifeq ($(QPE_VERSION),..)
64 QPE_VERSION=1.1.2 64 QPE_VERSION=1.1.2
65 endif 65 endif
66endif 66endif
67export QPE_VERSION 67export QPE_VERSION
68 68
69SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 69SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
70ifeq ($(VERSION_CVS),) 70ifeq ($(VERSION_CVS),)
71 VERSION_CVS:=$(shell date +%s) 71 VERSION_CVS:=$(shell date +%s)
72endif 72endif
73ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 73ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
74 SUB_VERSION:=$(VERSION_CVS) 74 SUB_VERSION:=$(VERSION_CVS)
75endif 75endif
76export SUB_VERSION 76export SUB_VERSION
77 77
78ifneq ($(strip $(SUB_VERSION)),) 78ifneq ($(strip $(SUB_VERSION)),)
79EXTRAVERSION=-$(SUB_VERSION) 79EXTRAVERSION=-$(SUB_VERSION)
80endif 80endif
81 81
82ifeq ($(QTE_REVISION),) 82ifeq ($(QTE_REVISION),)
83 QTE_REVISION=6 83 QTE_REVISION=6
84endif 84endif
85export QTE_REVISION 85export QTE_REVISION
86 86
87export DEB_VERSION=2.0 87export DEB_VERSION=2.0
88 88
89ifeq ($(QTE_BASEVERSION),) 89ifeq ($(QTE_BASEVERSION),)
90 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 90 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
91 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/;') 91 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/;')
92 else 92 else
93 QTE_BASEVERSION=2.3.7 93 QTE_BASEVERSION=2.3.7
94 endif 94 endif
95endif 95endif
96export QTE_BASEVERSION 96export QTE_BASEVERSION
97 97
98ifeq ($(QTE_VERSION),) 98ifeq ($(QTE_VERSION),)
99 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 99 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
100 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') 100 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
101 else 101 else
102 QTE_VERSION=2.3.7 102 QTE_VERSION=2.3.7
103 endif 103 endif
104endif 104endif
105export QTE_VERSION 105export QTE_VERSION
106 106
107export PATH:=$(OPIEDIR)/scripts:$(PATH) 107export PATH:=$(OPIEDIR)/scripts:$(PATH)
108export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 108export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
109 109
110ifdef CONFIG_OPTIMIZATIONS 110ifdef CONFIG_OPTIMIZATIONS
111export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 111export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
112export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 112export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
113endif 113endif
114 114
115ifeq ($(STRIP),) 115ifeq ($(STRIP),)
116 ifneq ($(CONFIG_TARGET_X86),) 116 ifneq ($(CONFIG_TARGET_X86),)
117 STRIP=strip 117 STRIP=strip
118 endif 118 endif
119 ifneq ($(CONFIG_TARGET_64BIT),) 119 ifneq ($(CONFIG_TARGET_64BIT),)
120 STRIP=strip 120 STRIP=strip
121 endif 121 endif
122 ifneq ($(CONFIG_TARGET_IPAQ),) 122 ifneq ($(CONFIG_TARGET_IPAQ),)
123 STRIP=arm-linux-strip 123 STRIP=arm-linux-strip
124 endif 124 endif
125 ifneq ($(CONFIG_TARGET_SHARP),) 125 ifneq ($(CONFIG_TARGET_SHARP),)
126 STRIP=arm-linux-strip 126 STRIP=arm-linux-strip
127 endif 127 endif
128 ifneq ($(CONFIG_TARGET_RAMSES),) 128 ifneq ($(CONFIG_TARGET_RAMSES),)