diff options
| author | axis <qt-info@nokia.com> | 2011-01-28 12:29:47 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-01-28 12:29:52 (GMT) |
| commit | edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0 (patch) | |
| tree | 221c64f67aeee3addfe19760322e1bd8bb2d79cd /mkspecs/common | |
| parent | 5e3c4b6a82df640c15778af72384c6b27f8860b7 (diff) | |
| parent | 8a443d2695344f26b9adf4310672e1a5fd62aeb5 (diff) | |
| download | Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.zip Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.tar.gz Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.tar.bz2 | |
Merge branch 'windowsMakefileBuildSupport' into earth-master
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/armcc.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 8 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf index 2c765bc..4f178d7 100644 --- a/mkspecs/common/armcc.conf +++ b/mkspecs/common/armcc.conf @@ -37,5 +37,6 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_THREAD += QMAKE_AR = armar --create +QMAKE_LIB = armar --create QMAKE_RANLIB = diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index b899a2f..a195027 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -2,7 +2,11 @@ # qmake configuration for makefile based symbian # -MAKEFILE_GENERATOR = SYMBIAN_UNIX +contains(QMAKE_HOST.os,Windows) { + MAKEFILE_GENERATOR = SYMBIAN_MINGW +} else { + MAKEFILE_GENERATOR = SYMBIAN_UNIX +} include(symbian.conf) @@ -29,6 +33,8 @@ QMAKE_PREFIX_STATICLIB = QMAKE_EXTENSION_STATICLIB = lib QMAKE_SYMBIAN_SHLIB = 1 +QMAKE_LINK_OBJECT_SCRIPT = objects + is_using_gnupoc { DEFINES *= __QT_PRODUCT_INCLUDE_IS_LOWERCASE__ } diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 0eb1336..cfeb0bb 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -114,11 +114,11 @@ contains(QMAKE_HOST.os,Windows) { } QMAKE_IDL = midl -QMAKE_LIB = ar -ru -QMAKE_RC = windres QMAKE_ZIP = zip -r -9 QMAKE_UNZIP = unzip -o +QMAKE_WRITE_DEFAULT_RC = 1 + QMAKE_TAR = tar -cf QMAKE_GZIP = gzip -9f |