diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-24 14:04:57 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-24 14:04:57 (GMT) |
| commit | d6fb0a8a1536c752c9feb399ce9a160aa6049fce (patch) | |
| tree | 7865e76d9f9c13282940d62d2d8a30f42e30d6d6 /qmake/Makefile.win32-g++ | |
| parent | ce288aa628dd9e9e97c302bb335e64fb55ed4f21 (diff) | |
| download | Qt-d6fb0a8a1536c752c9feb399ce9a160aa6049fce.zip Qt-d6fb0a8a1536c752c9feb399ce9a160aa6049fce.tar.gz Qt-d6fb0a8a1536c752c9feb399ce9a160aa6049fce.tar.bz2 | |
Ammend last INTEGRITY fix
Also build gbuild.cpp on windows
Diffstat (limited to 'qmake/Makefile.win32-g++')
| -rw-r--r-- | qmake/Makefile.win32-g++ | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index f58ca0a..0707a3a 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -39,7 +39,7 @@ OBJS = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \ makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.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 + symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o gbuild.o ifdef QMAKE_OPENSOURCE_EDITION CFLAGS += -DQMAKE_OPENSOURCE_EDITION @@ -311,6 +311,9 @@ registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp +gbuild.o: $(SOURCE_PATH)/qmake/generators/integrity/gbuild.cpp + $(CXX) $(CXXFLAGS) generators/integrity/gbuild.cpp + project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h $(CXX) $(CXXFLAGS) project.cpp |