[vlc-commits] contrib: don't use ln -s on Windows

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Oct  2 11:24:12 2018 +0200| [2ee53944ab269d4c5e6714019c007434fafee778] | committer: Steve Lhomme

contrib: don't use ln -s on Windows

It will fail.

"ln -s" is usually replaced by "cp -R" with autotools

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

 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 ddd8b16aaa..c21d7665c9 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -136,10 +136,14 @@ endif
 EXTRA_CFLAGS += $(CFLAGS)
 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 eb2b406d88..04e8031afb 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -90,7 +90,7 @@ ifdef HAVE_WIN32
 endif
 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) sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
 	cd $</src/tools; \