diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-05-18 13:23:00 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-05-18 13:26:32 (GMT) |
| commit | 88ff979e6c9aefe95f144eb64db0bb1a61d34996 (patch) | |
| tree | 45f308218ce1cc948d7c1e2762da17e00656d2c2 /qmake/Makefile.win32-g++ | |
| parent | f8c5d939a83cdcc4d02bab7a48668d07104e0287 (diff) | |
| parent | e737ca580654affdee656979b31fab7591972ff1 (diff) | |
| download | Qt-88ff979e6c9aefe95f144eb64db0bb1a61d34996.zip Qt-88ff979e6c9aefe95f144eb64db0bb1a61d34996.tar.gz Qt-88ff979e6c9aefe95f144eb64db0bb1a61d34996.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'qmake/Makefile.win32-g++')
| -rw-r--r-- | qmake/Makefile.win32-g++ | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 477203d..e52b8c6 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -27,7 +27,7 @@ CFLAGS = -c -o$@ -O \ -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DQT_BOOTSTRAPPED CXXFLAGS = $(CFLAGS) -LFLAGS = -static-libgcc -s +LFLAGS = -static-libgcc -static-libstdc++ -s LIBS = -lole32 -luuid LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = @@ -326,3 +326,4 @@ qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp + |