contrib: Update x265 cross compilation directives.

Necessary for cross compiling with gcc 8.

(cherry picked from commit 4f38d4782fd9d192cc3c5d3cce691990877ca64d)

diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs
index 12bbdedaa8d827ba221ca2760119c3c9b211b596..b7fa93d35eb7509582d0a8919656d9ceeead7da6 100644 (file)
--- a/contrib/x265_10bit/module.defs
+++ b/contrib/x265_10bit/module.defs
@@ -28,6 +28,14 @@ endif
 ifeq (1,$(BUILD.cross))
     ifeq (mingw,$(BUILD.system))
         X265_10.CONFIGURE.extra += -DWIN32=ON
+        X265_10.CONFIGURE.extra += -DCMAKE_SYSTEM_NAME=Windows
+        X265_10.CONFIGURE.extra += -DCMAKE_C_COMPILER=$(X265_10.GCC.gcc)
+        X265_10.CONFIGURE.extra += -DCMAKE_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_10.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_10.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(X265_10.GCC.gxx)
+        X265_10.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_10.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_10.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(BUILD.cross.prefix)windres
     endif
     X265_10.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(X265_10.CONFIGURE.host)"
     X265_10.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.build)"

diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs
index 17083172f13fb832a6d35bfcb6f0134e37d26d12..b141c4ca4903aa30ad573c042417cdf4564cbaf3 100644 (file)
--- a/contrib/x265_12bit/module.defs
+++ b/contrib/x265_12bit/module.defs
@@ -28,6 +28,14 @@ endif
 ifeq (1,$(BUILD.cross))
     ifeq (mingw,$(BUILD.system))
         X265_12.CONFIGURE.extra += -DWIN32=ON
+        X265_12.CONFIGURE.extra += -DCMAKE_SYSTEM_NAME=Windows
+        X265_12.CONFIGURE.extra += -DCMAKE_C_COMPILER=$(X265_12.GCC.gcc)
+        X265_12.CONFIGURE.extra += -DCMAKE_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_12.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_12.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(X265_12.GCC.gxx)
+        X265_12.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_12.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_12.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(BUILD.cross.prefix)windres
     endif
     X265_12.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(X265_12.CONFIGURE.host)"
     X265_12.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.build)"

diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs
index 158ba700c1a154ca5bb0848831cafe92dc4b2cb9..3733574e4417fad078c4260649d835b6941def38 100644 (file)
--- a/contrib/x265_8bit/module.defs
+++ b/contrib/x265_8bit/module.defs
@@ -25,6 +25,14 @@ endif
 ifeq (1,$(BUILD.cross))
     ifeq (mingw,$(BUILD.system))
         X265_8.CONFIGURE.extra += -DWIN32=ON
+        X265_8.CONFIGURE.extra += -DCMAKE_SYSTEM_NAME=Windows
+        X265_8.CONFIGURE.extra += -DCMAKE_C_COMPILER=$(X265_8.GCC.gcc)
+        X265_8.CONFIGURE.extra += -DCMAKE_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_8.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_8.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(X265_8.GCC.gxx)
+        X265_8.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_8.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
+        X265_8.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(BUILD.cross.prefix)windres
     endif
     X265_8.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(X265_8.CONFIGURE.host)"
     X265_8.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.build)"