diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 08:38:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 08:38:08 (GMT) |
| commit | 17a377ff9a2519dd228084851a1eb76fdc30d047 (patch) | |
| tree | 61396fa8bda063b19812bc5cb2e4e13ffcd1dd73 | |
| parent | 379b4dc81177b95c15de30c5925efca1136e4041 (diff) | |
| parent | a61d857587b4adbabbeec179117767de99d36be3 (diff) | |
| download | Qt-17a377ff9a2519dd228084851a1eb76fdc30d047.zip Qt-17a377ff9a2519dd228084851a1eb76fdc30d047.tar.gz Qt-17a377ff9a2519dd228084851a1eb76fdc30d047.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qmake/MinGw: Link statically.
| -rw-r--r-- | qmake/Makefile.win32-g++ | 3 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 2 |
2 files changed, 3 insertions, 2 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 + diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index 6aac39f..e4e2e6a 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -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 = |