[vlc-devel] [PATCH 16/19] Revert "contrib: qt: don't build release build in debug mode"

Steve Lhomme robux4 at videolabs.io
Wed Jun 14 14:02:05 CEST 2017


This reverts commit ed83de24abc9de89d9b34a83cd3278e79a2e3994.

I introduced this but it doesn't work well. The .pc files generated are not
pointing to the debug libraries.
---
 contrib/src/qt/rules.mak | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 9dae604409..5f76893712 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -34,17 +34,11 @@ QT_SPEC := win32-g++
 QT_PLATFORM := -xplatform win32-g++ -device-option CROSS_COMPILE=$(HOST)-
 endif
 
-QT_CONFIG := -static -opensource -confirm-license -no-pkg-config \
+QT_CONFIG := -static -release -no-debug -opensource -confirm-license -no-pkg-config \
 	-no-sql-sqlite -no-gif -qt-libjpeg -no-openssl -no-opengl -no-dbus \
 	-no-qml-debug -no-audio-backend -no-sql-odbc -no-pch \
 	-no-compile-examples -nomake examples
 
-ifndef WITH_OPTIMIZATION
-QT_CONFIG += -debug
-else
-QT_CONFIG += -release
-endif
-
 .qt: qt
 	cd $< && ./configure $(QT_PLATFORM) $(QT_CONFIG) -prefix $(PREFIX)
 	# Make && Install libraries
-- 
2.12.1



More information about the vlc-devel mailing list