diff options
author | Laszlo Papp <lpapp@kde.org> | 2013-03-18 11:21:38 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-25 23:11:22 +0100 |
commit | fff8b698ab50d84a9b3e37f087b075ea495b66c9 (patch) | |
tree | 7205f6bf5620c3e7e602fe2a48c7317087df569a /qmake/generators/win32 | |
parent | a3c802e7e504be00fa5d25893bd967e6b628afc6 (diff) |
Introduce QMAKE_CC_O_FLAG
This makes it possible to properly parametrize alternative compilers.
Change-Id: Iaf0961c47875ee16d815356f36acf5652577cdca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/win32')
-rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index e64b2160b3..be4f203f01 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -299,16 +299,16 @@ void MingwMakefileGenerator::init() project->values("QMAKE_RUN_CC").clear(); project->values("QMAKE_RUN_CC").append("$(CC) -c -include " + preCompHeader + - " $(CFLAGS) $(INCPATH) -o $obj $src"); + " $(CFLAGS) $(INCPATH) " + var("QMAKE_CC_O_FLAG") + "$obj $src"); project->values("QMAKE_RUN_CC_IMP").clear(); project->values("QMAKE_RUN_CC_IMP").append("$(CC) -c -include " + preCompHeader + - " $(CFLAGS) $(INCPATH) -o $@ $<"); + " $(CFLAGS) $(INCPATH) " + var("QMAKE_CC_O_FLAG") + "$@ $<"); project->values("QMAKE_RUN_CXX").clear(); project->values("QMAKE_RUN_CXX").append("$(CXX) -c -include " + preCompHeader + - " $(CXXFLAGS) $(INCPATH) -o $obj $src"); + " $(CXXFLAGS) $(INCPATH) " + var("QMAKE_CC_O_FLAG") + "$obj $src"); project->values("QMAKE_RUN_CXX_IMP").clear(); project->values("QMAKE_RUN_CXX_IMP").append("$(CXX) -c -include " + preCompHeader + - " $(CXXFLAGS) $(INCPATH) -o $@ $<"); + " $(CXXFLAGS) $(INCPATH) " + var("QMAKE_CC_O_FLAG") + "$@ $<"); } if(project->isActiveConfig("dll")) { |