summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make16
-rw-r--r--include.pro4
2 files changed, 18 insertions, 2 deletions
diff --git a/Vars.make b/Vars.make
index 788ebf5..cc463d3 100644
--- a/Vars.make
+++ b/Vars.make
@@ -10,16 +10,32 @@ endif
10ifeq ($(IPK_DIR),) 10ifeq ($(IPK_DIR),)
11 export IPK_DIR:=$(OPIEDIR) 11 export IPK_DIR:=$(OPIEDIR)
12endif 12endif
13 13
14ifneq ($(wildcard $(TOPDIR)/.config),) 14ifneq ($(wildcard $(TOPDIR)/.config),)
15 include $(TOPDIR)/.config 15 include $(TOPDIR)/.config
16endif 16endif
17 17
18ifdef CONFIG_TARGET_X86
19 PLATFORM=x86-linux
20endif
21ifdef CONFIG_TARGET_SHARP
22 PLATFORM=sharp-linux
23endif
24ifdef CONFIG_TARGET_IPAQ
25 PLATFORM=ipaq-linux
26endif
27ifdef CONFIG_TARGET_RAMSES
28 PLATFORM=ramses-linux
29endif
30ifdef CONFIG_TARGET_SIMPAD
31 PLATFORM=simpad-linux
32endif
33
18export QMAKE:=$(OPIEDIR)/qmake/qmake 34export QMAKE:=$(OPIEDIR)/qmake/qmake
19export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 35export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
20 36
21ifeq ($(QPE_VERSION),) 37ifeq ($(QPE_VERSION),)
22 VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) 38 VERSION_MAJ:=$(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)) 39 VERSION_MIN:=$(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)) 40 VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h))
25 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) 41 QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
diff --git a/include.pro b/include.pro
index 38294d4..3ba8776 100644
--- a/include.pro
+++ b/include.pro
@@ -69,12 +69,12 @@ lrelease.commands = lrelease $(PRO)
69 69
70ipk.target = ipk 70ipk.target = ipk
71ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 71ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
72 72
73QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease 73QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease
74QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 74QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
75QMAKE_LIBDIR += $(OPIEDIR)/lib 75QMAKE_LIBDIR += $(OPIEDIR)/lib
76 76
77MOC_DIR=.moc/$$PLATFORM 77MOC_DIR=.moc/$(PLATFORM)
78OBJECTS_DIR=.obj/$$PLATFORM 78OBJECTS_DIR=.obj/$(PLATFORM)
79 79
80include ( $(OPIEDIR)/gen.pro ) 80include ( $(OPIEDIR)/gen.pro )