diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-05-18 08:02:32 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-05-18 08:02:32 (GMT) |
| commit | a61d857587b4adbabbeec179117767de99d36be3 (patch) | |
| tree | 61396fa8bda063b19812bc5cb2e4e13ffcd1dd73 | |
| parent | 672c0d15ad07aaffeb7354e9fd8a822ee0d36ac2 (diff) | |
| download | Qt-a61d857587b4adbabbeec179117767de99d36be3.zip Qt-a61d857587b4adbabbeec179117767de99d36be3.tar.gz Qt-a61d857587b4adbabbeec179117767de99d36be3.tar.bz2 | |
qmake/MinGw: Link statically.
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
| -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 = |