vlc | branch: master | Thomas Guillem <[email protected]> | Thu Oct 25 10:12:48 2018 +0200| [8c381d410d48e6df8bc49a1bf0574594371cd82f] | committer: Thomas Guillem
contrib: qt: fix empty platform when not cross compiling > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c381d410d48e6df8bc49a1bf0574594371cd82f --- contrib/src/qt/rules.mak | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak index a3789a0a3b..e5ad13c62f 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -37,7 +37,7 @@ endif QT_OPENGL := -opengl desktop ifdef HAVE_MACOSX -QT_PLATFORM := -platform darwin-g++ +QT_SPEC := darwin-g++ endif ifdef HAVE_WIN32 ifdef HAVE_CLANG @@ -48,8 +48,10 @@ endif ifdef HAVE_CROSS_COMPILE QT_PLATFORM := -xplatform $(QT_SPEC) -device-option CROSS_COMPILE=$(HOST)- else +ifneq ($(QT_SPEC),) QT_PLATFORM := -platform $(QT_SPEC) endif +endif ifneq ($(findstring $(ARCH), arm aarch64),) # There is no opengl available on windows on these architectures. QT_OPENGL := -no-opengl _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
