| -rw-r--r-- | Vars.make | 1 | ||||
| -rw-r--r-- | config.in | 5 | ||||
| -rw-r--r-- | mkspecs/qws/linux-oe-g++/qmake.conf | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -12,24 +12,25 @@ ifneq ($(wildcard $(TOPDIR)/.config),) endif ifndef CONFIG_TARGET_OE ifndef QTDIR $(error QTDIR not set) endif else OEDIR:=$(CONFIG_OE_BUILD_DIR) QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 $(shell mkdir -p $(QTDIR)/src/moc) $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) PLATFORM=sharp-linux + OEHOSTSYS:=$(CONFIG_OE_HOST_SYS) 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 @@ -33,24 +33,29 @@ choice config TARGET_SIMPAD boolean "SIMpad" config TARGET_YOPY boolean "Yopy 3500/3700" 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 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" diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf index c4c273f..90166b0 100644 --- a/mkspecs/qws/linux-oe-g++/qmake.conf +++ b/mkspecs/qws/linux-oe-g++/qmake.conf @@ -1,23 +1,23 @@ # # $Id$ # # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler # MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += qt link_prl -STAGING_BINDIR = $(OEDIR)/tmp/staging/i686-linux/bin +STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = |