| -rw-r--r-- | Vars.make | 16 | ||||
| -rw-r--r-- | include.pro | 4 |
2 files changed, 18 insertions, 2 deletions
@@ -1,41 +1,57 @@ ifndef QTDIR $(error QTDIR not set) endif prefix=/opt/QtPalmtop ifeq ($(OPIEDIR),) export OPIEDIR:=$(TOPDIR) endif ifeq ($(IPK_DIR),) export IPK_DIR:=$(OPIEDIR) endif ifneq ($(wildcard $(TOPDIR)/.config),) include $(TOPDIR)/.config endif +ifdef CONFIG_TARGET_X86 + PLATFORM=x86-linux +endif +ifdef CONFIG_TARGET_SHARP + PLATFORM=sharp-linux +endif +ifdef CONFIG_TARGET_IPAQ + PLATFORM=ipaq-linux +endif +ifdef CONFIG_TARGET_RAMSES + PLATFORM=ramses-linux +endif +ifdef CONFIG_TARGET_SIMPAD + PLATFORM=simpad-linux +endif + export QMAKE:=$(OPIEDIR)/qmake/qmake export QMAKESPECSDIR=$(OPIEDIR)/mkspecs ifeq ($(QPE_VERSION),) VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) ifeq ($(QPE_VERSION),..) QPE_VERSION=0.9.3 endif endif export QPE_VERSION SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) ifeq ($(VERSION_CVS),) VERSION_CVS:=$(shell date +%Y%m%d) endif ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) SUB_VERSION:=$(VERSION_CVS) endif export SUB_VERSION diff --git a/include.pro b/include.pro index 38294d4..3ba8776 100644 --- a/include.pro +++ b/include.pro @@ -53,28 +53,28 @@ INSTALLS += sounds root.path = / root.files = root/* INSTALLS += root # new targets opie-lupdate.target = opie-lupdate opie-lupdate.commands = opie-lupdate -noobsolete $(PRO) opie-lrelease.target = opie-lrelease opie-lrelease.commands = opie-lrelease $(PRO) lupdate.target = lupdate lupdate.commands = lupdate -noobsolete $(PRO) lrelease.target = lrelease lrelease.commands = lrelease $(PRO) ipk.target = ipk ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib QMAKE_LIBDIR += $(OPIEDIR)/lib -MOC_DIR=.moc/$$PLATFORM -OBJECTS_DIR=.obj/$$PLATFORM +MOC_DIR=.moc/$(PLATFORM) +OBJECTS_DIR=.obj/$(PLATFORM) include ( $(OPIEDIR)/gen.pro ) |