[vlc-commits] Qt: do not use precompiled headers on Windows

Jean-Baptiste Kempf git at videolan.org
Mon Aug 8 12:01:51 CEST 2016


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug  8 12:00:57 2016 +0200| [d037762696fcea16f5bad589d8a25db1dee21523] | committer: Jean-Baptiste Kempf

Qt: do not use precompiled headers on Windows

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d037762696fcea16f5bad589d8a25db1dee21523
---

 contrib/src/qt/pch.patch | 12 ++++++++++++
 contrib/src/qt/rules.mak |  1 +
 2 files changed, 13 insertions(+)

diff --git a/contrib/src/qt/pch.patch b/contrib/src/qt/pch.patch
new file mode 100644
index 0000000..de9689f
--- /dev/null
+++ b/contrib/src/qt/pch.patch
@@ -0,0 +1,12 @@
+diff -ruN qt/mkspecs/win32-g++/qmake.conf qt.new/mkspecs/win32-g++/qmake.conf
+--- qt/mkspecs/win32-g++/qmake.conf	2016-03-03 12:35:22.000000000 +0100
++++ qt.new/mkspecs/win32-g++/qmake.conf	2016-08-06 11:33:47.010286322 +0200
+@@ -12,7 +12,7 @@
+ 
+ MAKEFILE_GENERATOR      = MINGW
+ QMAKE_PLATFORM          = win32 mingw
+-CONFIG                 += debug_and_release debug_and_release_target precompile_header
++CONFIG                 += debug_and_release debug_and_release_target
+ DEFINES                += UNICODE
+ QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
+ 
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index f29853c..014a39e 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -22,6 +22,7 @@ $(TARBALLS)/qt-$(QT_VERSION).tar.xz:
 qt: qt-$(QT_VERSION).tar.xz .sum-qt
 	$(UNPACK)
 	mv qtbase-opensource-src-$(QT_VERSION) qt-$(QT_VERSION)
+	$(APPLY) $(SRC)/qt/pch.patch
 	$(MOVE)
 
 ifdef HAVE_MACOSX



More information about the vlc-commits mailing list