diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-04-23 06:10:12 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2010-04-24 18:44:48 (GMT) |
| commit | 9af9e1d92504647e41d27c1229a2572a90bf4fd7 (patch) | |
| tree | a009b26774699be83b0a944ee0587805023b9689 /qmake/Makefile.win32-g++-sh | |
| parent | e8e26d3f3f7eedf080892dc000ca11360e4cf1c6 (diff) | |
| download | Qt-9af9e1d92504647e41d27c1229a2572a90bf4fd7.zip Qt-9af9e1d92504647e41d27c1229a2572a90bf4fd7.tar.gz Qt-9af9e1d92504647e41d27c1229a2572a90bf4fd7.tar.bz2 | |
Fix all qmake Makefiles to include the MSBuild backend
Reviewed-by: trustme
Diffstat (limited to 'qmake/Makefile.win32-g++-sh')
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index 755d046..6aac39f 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -37,8 +37,8 @@ ADDCLEAN = OBJS = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \ option.o winmakefile.o projectgenerator.o property.o meta.o \ makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \ - borland_bmake.o msvc_nmake.o msvc_vcproj.o \ - msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \ + borland_bmake.o msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \ + msvc_objectmodel.o msbuild_objectmodel.o symmake.o initprojectdeploy_symbian.o \ symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o ifdef QMAKE_OPENSOURCE_EDITION @@ -263,6 +263,12 @@ msvc_vcproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp msvc_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp +msvc_vcxproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcxproj.cpp + $(CXX) $(CXXFLAGS) generators/win32/msvc_vcxproj.cpp + +msbuild_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msbuild_objectmodel.cpp + $(CXX) $(CXXFLAGS) generators/win32/msbuild_objectmodel.cpp + symmake.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp $(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp |