[vlc-commits] contrib: use the WINDRES variable to set the CMake cross compilation one

Steve Lhomme git at videolan.org
Thu Jun 18 18:31:37 CEST 2020


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | 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 <robux4 at ycbcr.xyz>

> 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



More information about the vlc-commits mailing list