vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Tue Oct 2 11:24:12 2018 +0200| [6c0b12dae8d6bb51ef744a7e0762db87b87512ae] | committer: Steve Lhomme
contrib: don't use ln -s on Windows It will fail. "ln -s" is usually replaced by "cp -R" with autotools (cherry picked from commit 2ee53944ab269d4c5e6714019c007434fafee778) (rebased) rebased: - qt had different patches when this was merged in the main branch Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6c0b12dae8d6bb51ef744a7e0762db87b87512ae --- contrib/src/main.mak | 4 ++++ contrib/src/qt/rules.mak | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 9c2e041418..b9d6da0d85 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -148,10 +148,14 @@ CCAS=gas-preprocessor.pl $(CC) -c endif endif +LN_S = ln -s ifdef HAVE_WIN32 ifneq ($(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E __MINGW64_VERSION_MAJOR),) HAVE_MINGW_W64 := 1 endif +ifndef HAVE_CROSS_COMPILE +LN_S = cp -R +endif ifneq ($(findstring clang, $(shell $(CC) --version)),) HAVE_CLANG := 1 endif diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak index 3496eec1bb..535eebfd0c 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -68,7 +68,7 @@ QT_CONFIG += -release cd $(PREFIX)/lib/pkgconfig; sed -i -e 's/ -lQt5Gui/ -lqwindows -lQt5PlatformSupport -lQt5Gui/g' Qt5Gui.pc ifdef HAVE_CROSS_COMPILE # Building Qt build tools for Xcompilation - cd $</include/QtCore; ln -sf $(QT_VERSION)/QtCore/private + cd $</include/QtCore; $(LN_S)f $(QT_VERSION)/QtCore/private private cd $<; $(MAKE) -C qmake cd $<; $(MAKE) install_qmake install_mkspecs cd $</src/tools; \ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
