-rw-r--r-- | Vars.make | 16 | ||||
-rw-r--r-- | include.pro | 4 |
2 files changed, 18 insertions, 2 deletions
@@ -10,16 +10,32 @@ 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),) | 14 | ifneq ($(wildcard $(TOPDIR)/.config),) |
15 | include $(TOPDIR)/.config | 15 | include $(TOPDIR)/.config |
16 | endif | 16 | endif |
17 | 17 | ||
18 | ifdef CONFIG_TARGET_X86 | ||
19 | PLATFORM=x86-linux | ||
20 | endif | ||
21 | ifdef CONFIG_TARGET_SHARP | ||
22 | PLATFORM=sharp-linux | ||
23 | endif | ||
24 | ifdef CONFIG_TARGET_IPAQ | ||
25 | PLATFORM=ipaq-linux | ||
26 | endif | ||
27 | ifdef CONFIG_TARGET_RAMSES | ||
28 | PLATFORM=ramses-linux | ||
29 | endif | ||
30 | ifdef CONFIG_TARGET_SIMPAD | ||
31 | PLATFORM=simpad-linux | ||
32 | endif | ||
33 | |||
18 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 34 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
19 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 35 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
20 | 36 | ||
21 | ifeq ($(QPE_VERSION),) | 37 | ifeq ($(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 | ||
70 | ipk.target = ipk | 70 | ipk.target = ipk |
71 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 71 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
72 | 72 | ||
73 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease | 73 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease |
74 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 74 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
75 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 75 | QMAKE_LIBDIR += $(OPIEDIR)/lib |
76 | 76 | ||
77 | MOC_DIR=.moc/$$PLATFORM | 77 | MOC_DIR=.moc/$(PLATFORM) |
78 | OBJECTS_DIR=.obj/$$PLATFORM | 78 | OBJECTS_DIR=.obj/$(PLATFORM) |
79 | 79 | ||
80 | include ( $(OPIEDIR)/gen.pro ) | 80 | include ( $(OPIEDIR)/gen.pro ) |