[vlc-devel] [PATCH 04/19] contrib: only force CMAKE_RC_COMPILER when cross compiling

Steve Lhomme robux4 at videolabs.io
Wed Jun 14 14:01:53 CEST 2017


The default rule (does) work on mingw
---
 contrib/src/main.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 96306153f8..39b18f0c47 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -472,8 +472,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))" >> $@
-- 
2.12.1



More information about the vlc-devel mailing list