diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-01-08 14:36:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-12 07:16:37 +0100 |
| commit | cded50e6f23594a0acc65c6e949d0bf99bd7bf6f (patch) | |
| tree | c827d2c91abdbfd5ec9a4547b63d572803a95735 | |
| parent | 94649b4cbd174c12aae4c7a2341067c8331379f6 (diff) | |
MinGW: Statically link runtime libraries into qmake
Avoid runtime dependencies to e.g. libpwinthread-1.dll, libstc++-6.dll.
This prevents Qt Creator from spitting out error dialogs on each startup
for registered MinGW versions that aren't in the default PATH.
Change-Id: Id55518db8c8e0521b6a41add1eaf38f75a892c8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | dist/changes-5.0.1 | 1 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++ | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1 index 479ac344ce..3d9a59dd0a 100644 --- a/dist/changes-5.0.1 +++ b/dist/changes-5.0.1 @@ -98,6 +98,7 @@ Qt for Windows CE * Compiler Specific Changes * **************************************************************************** + - MinGW: Statically link runtime libraries into qmake **************************************************************************** * Tools * diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 7bc24edef9..565d5d2d51 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -54,7 +54,7 @@ CFLAGS = -c -o$@ -O \ -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DUNICODE CXXFLAGS = $(CFLAGS) -LFLAGS = -static-libgcc -s +LFLAGS = -static -s LIBS = -lole32 -luuid -ladvapi32 -lkernel32 LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = |