From c0791b86ab4b006f9ab2b7f932d5c76a159f6c08 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 16 Mar 2012 12:17:26 +0100 Subject: allow the unix generator to run in windows host mode this is a complete bastardization of the concept and breaks the (unused) debugging feature to create proper unix makefiles under windows, but apparently it permits cross-compiling unix targets under windows. Change-Id: I4ee95a20e7d6a6b2063ec7aa22f52c1a97d78a77 Reviewed-by: Oliver Wolff Reviewed-by: Joerg Bornemann --- qmake/generators/metamakefile.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qmake') 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; -- cgit v1.2.3 From fbc251b364f9335be3c22df31ede449fb965d8d8 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Fri, 16 Mar 2012 12:59:09 -0500 Subject: Win32: Compile qmake when shadow-building Change-Id: I803c733f744372701c51e4d629ff797c6648f833 Reviewed-by: Oswald Buddenhagen --- qmake/Makefile.win32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 89444c9c3c..4e169f3270 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -159,7 +159,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) $< -- cgit v1.2.3