diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32-g++ | 3 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 1 |
3 files changed, 4 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 = diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 522d517..99cdd11 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -396,6 +396,7 @@ VCXCLCompilerTool::VCXCLCompilerTool() MultiProcessorCompilation(unset), OmitDefaultLibName(unset), OmitFramePointers(unset), + Optimization("Disabled"), OpenMPSupport(unset), PreprocessKeepComments(unset), PreprocessSuppressLineNumbers(unset), |