gumstix: Add preliminary configuration for QT compilation

diff --git a/.gitmodules b/.gitmodules
index 94b58257479eb94ba31c1cfca59a6269a46e2d5a..e887ae0f7a5710a0956e1ab2aa9c5e97ee25112b 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "src/ulan-app"]
        path = src/ulan-app
        url = git://ulan.git.sourceforge.net/gitroot/ulan/ulan-app
+[submodule "src/3rdparty/qt"]
+       path = src/3rdparty/qt
+       url = git://gitorious.org/qt/qt.git

diff --git a/build/gumstix/config.target b/build/gumstix/config.target
index 8391743f2b151d58097de22dcc2b4088a596e9ed..9f7c92f0ea1d61b3a8d83c6bdaf9476f12cc2be5 100644 (file)
--- a/build/gumstix/config.target
+++ b/build/gumstix/config.target
@@ -12,5 +12,3 @@ CXXFLAGS = $(CFLAGS)
 
 IDL_COMPILER = orte-idl
 IDL_COMPILER=$(MAKERULES_DIR)/../host/_compiled/bin/orte-idl
-CONFIG_UOLED_TTY="/dev/null"
-CONFIG_OC_ULUTKERN=n

diff --git a/build/gumstix/qt/Makefile b/build/gumstix/qt/Makefile
new file mode 100644 (file)
index 0000000..08cf5ff
--- /dev/null
+++ b/build/gumstix/qt/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else   
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/build/gumstix/qt/Makefile.omk b/build/gumstix/qt/Makefile.omk
new file mode 100644 (file)
index 0000000..e933cdc
--- /dev/null
+++ b/build/gumstix/qt/Makefile.omk
@@ -0,0 +1,12 @@
+# -*- makefile -*-
+
+library-pass_HOOKS = compile-qt
+
+compile-qt: config.status make
+
+config.status: $(SOURCES_DIR)/qt-src/configure
+       cp -a $(SOURCES_DIR)/linux-arm-gumstix-g++ $(SOURCES_DIR)/qt-src/mkspecs/qws
+       $< -embedded arm --prefix=$(OUTPUT_DIR)/$(COMPILED_DIR_NAME) -xplatform qws/linux-arm-gumstix-g++ -opensource -confirm-license -little-endian -qt-gfx-linuxfb
+
+make: config.status
+       $(MAKE)

diff --git a/build/gumstix/qt/linux-arm-gumstix-g++/qmake.conf b/build/gumstix/qt/linux-arm-gumstix-g++/qmake.conf
new file mode 100644 (file)
index 0000000..48ac275
--- /dev/null
+++ b/build/gumstix/qt/linux-arm-gumstix-g++/qmake.conf
@@ -0,0 +1,23 @@
+#
+# qmake configuration for building with arm-linux-gnueabi-g++ - used
+# for Eurobot team Flamingos. It would be better if we use the same
+# settings from OMK's config.target, but I do not know how to achieve
+# that.
+#
+
+include(../../common/g++.conf)
+include(../../common/linux.conf)
+include(../../common/qws.conf)
+
+# modifications to g++.conf
+QMAKE_CC                = arm-linux-gnueabi-gcc
+QMAKE_CXX               = arm-linux-gnueabi-g++
+QMAKE_LINK              = arm-linux-gnueabi-g++
+QMAKE_LINK_SHLIB        = arm-linux-gnueabi-g++
+
+# modifications to linux.conf
+QMAKE_AR                = arm-linux-gnueabi-ar cqs
+QMAKE_OBJCOPY           = arm-linux-gnueabi-objcopy
+QMAKE_STRIP             = arm-linux-gnueabi-strip
+
+load(qt_config)

diff --git a/build/gumstix/qt/linux-arm-gumstix-g++/qplatformdefs.h b/build/gumstix/qt/linux-arm-gumstix-g++/qplatformdefs.h
new file mode 100644 (file)
index 0000000..9e4c65e
--- /dev/null
+++ b/build/gumstix/qt/linux-arm-gumstix-g++/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"

diff --git a/build/gumstix/qt/qt-src b/build/gumstix/qt/qt-src
new file mode 120000 (symlink)
index 0000000..673189f
--- /dev/null
+++ b/build/gumstix/qt/qt-src
@@ -0,0 +1 @@
+../../../src/3rdparty/qt
\ No newline at end of file

diff --git a/src/3rdparty/qt b/src/3rdparty/qt
new file mode 160000 (submodule)
index 0000000..0828c69
--- /dev/null
+++ b/src/3rdparty/qt
@@ -0,0 +1 @@
+Subproject commit 0828c69ad805406568f6eef2bffbbd54b04dea41