vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Fri Feb 15 
11:12:04 2019 +0100| [bebb2dc5f9546caccebd12fbe50257dcfe73e586] | committer: 
Steve Lhomme

contrib: use the WINDRES variable to set the CMake cross compilation one

On msys2/windows it's necessary to add the .exe, so it's done in the environment

(cherry picked from commit a360d026e36d06ae8583fb32fb116fa15be49cd7)
Signed-off-by: Steve Lhomme <[email protected]>

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

 contrib/src/main.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 0eb5e8809a..ba46962ce0 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -525,7 +525,7 @@ else
 endif
 endif
 ifdef HAVE_CROSS_COMPILE
-       echo "set(CMAKE_RC_COMPILER $(HOST)-windres)" >> $@
+       echo "set(CMAKE_RC_COMPILER $(WINDRES))" >> $@
 endif
 endif
 ifdef HAVE_DARWIN_OS

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to