summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-11-08 23:05:45 (UTC)
committer llornkcor <llornkcor>2005-11-08 23:05:45 (UTC)
commita8063e0797d6edf2ead22fc8c5346ddf187f0b5d (patch) (side-by-side diff)
treedf550982ac6985f6df9c01f4951f4efa6e678f6c
parent18d6f344e4656e7f77497d345f1480cecd4d2f31 (diff)
downloadopie-a8063e0797d6edf2ead22fc8c5346ddf187f0b5d.zip
opie-a8063e0797d6edf2ead22fc8c5346ddf187f0b5d.tar.gz
opie-a8063e0797d6edf2ead22fc8c5346ddf187f0b5d.tar.bz2
add 64bit target
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make6
-rw-r--r--config.in4
2 files changed, 10 insertions, 0 deletions
diff --git a/Vars.make b/Vars.make
index 6a52a93..880ccf1 100644
--- a/Vars.make
+++ b/Vars.make
@@ -7,48 +7,51 @@ ifeq ($(IPK_DIR),)
export IPK_DIR:=$(OPIEDIR)
endif
ifneq ($(wildcard $(TOPDIR)/.config),)
include $(TOPDIR)/.config
endif
ifndef CONFIG_TARGET_OE
ifndef QTDIR
$(error QTDIR not set)
endif
else
OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g')
OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
OETARGETSYS:=$(shell echo $(CONFIG_OE_TARGET_SYS) | sed -e's/"//g')
QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/$(OETARGETSYS)/qt2
$(shell mkdir -p $(QTDIR)/src/moc)
$(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile)
PLATFORM=sharp-linux
endif
ifdef CONFIG_TARGET_X86
PLATFORM=x86-linux
endif
+ifdef CONFIG_TARGET_64BIT
+ PLATFORM=64-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
ifdef CONFIG_TARGET_YOPY
PLATFORM=yopy-linux
endif
ifdef CONFIG_TARGET_MACOSX
PLATFORM=macx-darwin
endif
export QMAKE:=$(OPIEDIR)/qmake/qmake
export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
ifeq ($(QPE_VERSION),)
@@ -92,41 +95,44 @@ ifeq ($(QTE_BASEVERSION),)
endif
export QTE_BASEVERSION
ifeq ($(QTE_VERSION),)
ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
else
QTE_VERSION=2.3.7
endif
endif
export QTE_VERSION
export PATH:=$(OPIEDIR)/scripts:$(PATH)
export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
ifdef CONFIG_OPTIMIZATIONS
export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
endif
ifeq ($(STRIP),)
ifneq ($(CONFIG_TARGET_X86),)
STRIP=strip
endif
+ ifneq ($(CONFIG_TARGET_64BIT),)
+ STRIP=strip
+ endif
ifneq ($(CONFIG_TARGET_IPAQ),)
STRIP=arm-linux-strip
endif
ifneq ($(CONFIG_TARGET_SHARP),)
STRIP=arm-linux-strip
endif
ifneq ($(CONFIG_TARGET_RAMSES),)
STRIP=arm-linux-strip
endif
ifneq ($(CONFIG_TARGET_SIMPAD),)
STRIP=arm-linux-strip
endif
ifneq ($(CONFIG_TARGET_YOPY),)
STRIP=arm-linux-strip
endif
endif
diff --git a/config.in b/config.in
index 61107e7..e979966 100644
--- a/config.in
+++ b/config.in
@@ -14,48 +14,52 @@ choice
config TARGET_MACOSX
boolean "Mac OS X (DARWIN)"
config TARGET_SHARP
boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)"
config TARGET_C700
boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)"
config TARGET_OE
boolean "OpenEmbedded w/ OE build dir set below"
config TARGET_IPAQ
boolean "iPAQ"
config TARGET_RAMSES
boolean "Ramses"
config TARGET_SIMPAD
boolean "SIMpad"
config TARGET_YOPY
boolean "Yopy 3500/3700"
+
+ config TARGET_64BIT
+ boolean "64 BIT"
+
endchoice
config OE_BUILD_DIR
depends TARGET_OE
string "OE build directory"
default ">>>set OpenEmbedded build directory here<<<"
config OE_HOST_SYS
depends TARGET_OE
string "OE host system"
default "i686-linux"
config OE_TARGET_SYS
depends TARGET_OE
string "OE target system"
default "arm-linux"
config OPTIMIZE
boolean "Use optimizations"
default "y" if ! TARGET_X86
config THREADED
boolean "Enable threaded build"
default "n"