add 64bit target

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
@@ -1,132 +1,138 @@
 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
 
 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),)
     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=1.1.2
     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 +%s)
 endif
 ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
     SUB_VERSION:=$(VERSION_CVS)
 endif
 export SUB_VERSION
 
 ifneq ($(strip $(SUB_VERSION)),)
 EXTRAVERSION=-$(SUB_VERSION)
 endif
 
 ifeq ($(QTE_REVISION),)
     QTE_REVISION=6
 endif
 export QTE_REVISION
 
 export DEB_VERSION=2.0
 
 ifeq ($(QTE_BASEVERSION),)
     ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
         QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
     else
         QTE_BASEVERSION=2.3.7
     endif
 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
@@ -1,133 +1,137 @@
 mainmenu "Opie Configuration"
 
 menu "Build Parameters"
 
 choice
   prompt "Target Machine"
   default TARGET_X86
   help
     Please select the architecture of the machine you will be
     building the OpenZaurus buildroot for.
 
   config TARGET_X86
     boolean "Intel X86"
 
   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"
 
 config STATIC
   boolean "Build static libraries"
   default "n"
 
 config DEBUG
   boolean "Enable debug builds"
   default n
 
 config RELEASE
   bool
   default y
   depends !DEBUG
   
 config QUICK_LAUNCH
   boolean "Enable Quick Launch"
   default n if TARGET_X86
   default y if ! TARGET_X86
   
 config QUICKLAUNCH_PATH
   string "Path to quicklauncher"
   default "./quicklauncher" if TARGET_X86
   default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
 
 config SPECFILE
   string
   default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
   default "linux-g++" if TARGET_X86 && X11
   default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
   default "linux-g++" if TARGET_SHARP && X11
   default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
   default "linux-g++" if TARGET_IPAQ && X11
   default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
   default "linux-g++" if TARGET_RAMSES && X11
   default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
   default "linux-g++" if TARGET_SIMPAD && X11
   default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
   default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
   default "qws/linux-oe-g++" if TARGET_OE && (!X11)
 
 config CUSTOMFILE
   string
   default "custom-ipaq.h" if TARGET_IPAQ
   default "custom-sharp.h" if TARGET_SHARP
   default "custom-ramses.h" if TARGET_RAMSES
   default "custom-ipaq.h" if TARGET_SIMPAD
   default "custom-yopy.h" if TARGET_YOPY
 
 config OPTIMIZATIONS
   string "Optimization flags"
   depends OPTIMIZE
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
   default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700
 
 config EXPERIMENTAL
   bool "Prompt for development and/or incomplete items"
   default y
 
 config USE_CCACHE
   bool "Use ccache, if available?"
   default y
 
 endmenu
 
 menu "Configuration"
 config OPIE_NO_BUILTIN_SHUTDOWN
   boolean "Disable the built in shutdown application"
   default y