summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-07-10 04:59:59 (UTC)
committer llornkcor <llornkcor>2003-07-10 04:59:59 (UTC)
commit6abb84fb644b6746ad35e48c67f46e33de99bad2 (patch) (side-by-side diff)
tree43331a89fec5b13dc81cf8af4fe383d4ac781a73
parent155d68c1e7d7dc0fed2534ac43d6d77ce2781f55 (diff)
downloadopie-6abb84fb644b6746ad35e48c67f46e33de99bad2.zip
opie-6abb84fb644b6746ad35e48c67f46e33de99bad2.tar.gz
opie-6abb84fb644b6746ad35e48c67f46e33de99bad2.tar.bz2
add PLATFORM... bleh
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
@@ -6,24 +6,40 @@ 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
diff --git a/include.pro b/include.pro
index 38294d4..3ba8776 100644
--- a/include.pro
+++ b/include.pro
@@ -65,16 +65,16 @@ 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 )