diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32 | 2 | ||||
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 8e37b3e646..2379473af0 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -161,7 +161,7 @@ $(OBJS): qmake_pch.obj $(QTOBJS): qmake_pch.obj qmake_pch.obj: - $(CXX) $(CXXFLAGS_BARE) -c -Yc -Fpqmake_pch.pch -TP qmake_pch.h + $(CXX) $(CXXFLAGS_BARE) -c -Yc -Fpqmake_pch.pch -TP $(QMKSRC)\qmake_pch.h {$(SOURCE_PATH)\qmake\generators\mac}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index b855585500..c69d5a5812 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -520,6 +520,9 @@ MetaMakefileGenerator::modesForGenerator(const QString &gen, #ifdef Q_OS_MAC *host_mode = Option::HOST_MACX_MODE; *target_mode = Option::TARG_MACX_MODE; +#elif defined(Q_OS_WIN) + *host_mode = Option::HOST_WIN_MODE; + *target_mode = Option::TARG_UNIX_MODE; #else *host_mode = Option::HOST_UNIX_MODE; *target_mode = Option::TARG_UNIX_MODE; |