diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2013-06-05 16:46:12 -0400 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-18 10:52:11 +0200 |
commit | f20c3e06bf517a6e23d20afddd0ba36bfd611244 (patch) | |
tree | 232280ae31b609e6d1369fd37ec1414285770da4 /share/qbs/modules/cpp/ios-gcc.qbs | |
parent | a213f293f525759342d5e73d497858d728168bae (diff) |
Change targetOS and hostOS to lists, and remove targetPlatform.
Change-Id: I33317c857a319e0fa25c9e0d0cc69abc4ad3fabb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/ios-gcc.qbs')
-rw-r--r-- | share/qbs/modules/cpp/ios-gcc.qbs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs index ef169911b..79b49e316 100644 --- a/share/qbs/modules/cpp/ios-gcc.qbs +++ b/share/qbs/modules/cpp/ios-gcc.qbs @@ -5,15 +5,17 @@ import 'darwin-tools.js' as DarwinTools import 'bundle-tools.js' as BundleTools DarwinGCC { - condition: qbs.hostOS === 'osx' && qbs.targetOS === 'ios' && qbs.toolchain.contains('gcc') + condition: qbs.hostOS.contains('osx') && qbs.targetOS.contains('ios') && qbs.toolchain.contains('gcc') property string signingIdentity property string provisionFile - property bool buildIpa: qbs.architecture.match("^arm") === "arm" + property bool buildIpa: !qbs.targetOS.contains('ios-simulator') visibility: "hidden" - optimization: ((qbs.buildVariant === "debug" ) ? "none" : - (qbs.architecture.match("^arm") === "arm") ? "small" : - "fast") + optimization: { + if (qbs.buildVariant === "debug") + return "none"; + return qbs.targetOS.contains('ios-simulator') ? "fast" : "small" + } platformCommonCompilerFlags: base.concat(["-fvisibility-inlines-hidden", "-g", "-gdwarf-2", "-fPIE"]) commonCompilerFlags: ["-fpascal-strings", "-fexceptions", "-fasm-blocks", "-fstrict-aliasing"] |