summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-11-16 08:53:38 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-11-16 13:31:29 (GMT)
commitd4150975af620e2889cc58bd476bac6b4d101db3 (patch)
tree15e000be38cc530e25f68066ade6581d14a4f60d /qmake
parent2326a8d878e0d18473c27ddd54880621518b6e6e (diff)
downloadQt-d4150975af620e2889cc58bd476bac6b4d101db3.zip
Qt-d4150975af620e2889cc58bd476bac6b4d101db3.tar.gz
Qt-d4150975af620e2889cc58bd476bac6b4d101db3.tar.bz2
Windows: Add gcc 4.6.
- Add gcc 4.6 mkspec for > 4.4 (win32-g++-4.6) - Add detection of g++ version and 64bit to configure. Reviewed-by: mariusSO
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.win32-g++2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index d40dc29..5fa1e5e 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 -DQLIBRARYINFO_EPOCROOT
CXXFLAGS = $(CFLAGS)
-LFLAGS = -static-libgcc -static-libstdc++ -s
+LFLAGS = -static-libgcc -s
LIBS = -lole32 -luuid -ladvapi32 -lkernel32
LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
ADDCLEAN =