diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-07-09 16:18:14 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2013-07-19 10:50:00 +0200 |
| commit | fbc1b75ffa8d2163d92f3c59a56a22bf18977a7a (patch) | |
| tree | a0caec6a3e82153d2ef9c740c2ebd16303028f41 | |
| parent | e02ce75d75bb679b334699ac1f72c605797d807d (diff) | |
[GYP] use cflags/cxxflags from qmake
Change-Id: Ia3af98df7ea13d71b40e34e524c49f326003926d
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf index 02de2ecc7..d40ee3c34 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/build/qmake/mkspecs/features/gyp_generator.prf @@ -49,9 +49,18 @@ GYP_CONTENTS += " ]," GYP_CONTENTS += " 'ldflags': [" for (lib, LIBS): GYP_CONTENTS += " '$$lib'," !isEmpty(QMAKE_RPATHDIR): GYP_CONTENTS += " '$$QMAKE_RPATH$$QMAKE_RPATHDIR'," - GYP_CONTENTS += " ]," +!isEmpty(QMAKE_CFLAGS) { + GYP_CONTENTS += " 'cflags': [" + for(flag, QMAKE_CFLAGS): GYP_CONTENTS += " '$$flag'," + GYP_CONTENTS += " ]," +} +!isEmpty(QMAKE_CXXFLAGS) { + GYP_CONTENTS += " 'cflags_cc': [" + for(flag, QMAKE_CXXFLAGS): GYP_CONTENTS += " '$$flag'," + GYP_CONTENTS += " ]," +} macx { GYP_CONTENTS += " 'link_settings': {" \ " 'libraries': [" |