[vlc-commits] contrib: only force CMAKE_RC_COMPILER when cross compiling

Steve Lhomme git at videolan.org
Wed Jun 14 16:53:03 CEST 2017


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Jun 14 14:01:53 2017 +0200| [f50a917dfe56b1af60eba6bdb94de07acff923b0] | committer: Hugo Beauzée-Luyssen

contrib: only force CMAKE_RC_COMPILER when cross compiling

The default rule (does) work on mingw

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 contrib/src/main.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index be37866702..e95b789a92 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -468,8 +468,10 @@ ifndef WITH_OPTIMIZATION
 else
 	echo "set(CMAKE_BUILD_TYPE Release)" >> $@
 endif
+ifdef HAVE_CROSS_COMPILE
 	echo "set(CMAKE_RC_COMPILER $(HOST)-windres)" >> $@
 endif
+endif
 ifdef HAVE_DARWIN_OS
 	echo "set(CMAKE_SYSTEM_NAME Darwin)" >> $@
 	echo "set(CMAKE_C_FLAGS $(CFLAGS) $(EXTRA_CFLAGS))" >> $@



More information about the vlc-commits mailing list