diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-02 10:46:13 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-02 11:14:06 (GMT) |
| commit | 77439ac992bd9db2845ab3a05b32d2b3ea5dc26c (patch) | |
| tree | c4b00653bd0d6f13f6eeaae48735219eb32efd63 | |
| parent | 1eafe0ea2ecc3bce733d574f39bc26652baaec38 (diff) | |
| download | Qt-77439ac992bd9db2845ab3a05b32d2b3ea5dc26c.zip Qt-77439ac992bd9db2845ab3a05b32d2b3ea5dc26c.tar.gz Qt-77439ac992bd9db2845ab3a05b32d2b3ea5dc26c.tar.bz2 | |
Give the qws ppc mkspec usable default values
and keep ./configure -embedded still work on ppc platforms
Reviewed-by:tom
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | mkspecs/qws/linux-ppc-g++/qmake.conf | 11 |
2 files changed, 11 insertions, 3 deletions
@@ -2313,9 +2313,6 @@ if [ "$CFG_EMBEDDED" != "no" ]; then *86_64) PLATFORM=qws/linux-x86_64-g++ ;; - *ppc) - PLATFORM=qws/linux-ppc-g++ - ;; *) PLATFORM=qws/linux-generic-g++ ;; diff --git a/mkspecs/qws/linux-ppc-g++/qmake.conf b/mkspecs/qws/linux-ppc-g++/qmake.conf index a026e88..e1926b4 100644 --- a/mkspecs/qws/linux-ppc-g++/qmake.conf +++ b/mkspecs/qws/linux-ppc-g++/qmake.conf @@ -6,4 +6,15 @@ include(../../common/g++.conf) include(../../common/linux.conf) include(../../common/qws.conf) +# modifications to g++.conf +QMAKE_CC = powerpc-linux-gcc +QMAKE_CXX = powerpc-linux-g++ +QMAKE_LINK = powerpc-linux-g++ +QMAKE_LINK_SHLIB = powerpc-linux-g++ + +# modifications to linux.conf +QMAKE_AR = powerpc-linux-ar cqs +QMAKE_OBJCOPY = powerpc-linux-objcopy +QMAKE_STRIP = powerpc-linux-strip + load(qt_config) |