diff options
| author | Scott <[email protected]> | 2021-04-13 20:35:41 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-04-13 20:35:41 +0100 |
| commit | c4ebb139b885720400b5172ee203b428f5fac109 (patch) | |
| tree | 406189f29baffd5ad23305784b58265aa212c5a6 /contrib | |
| parent | 6fec869301eefc2eb3d938e59f5641e9ac06662b (diff) | |
Testing a build fix for Github Actions
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/x265_8bit/module.defs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs index 8492986a4..dce5b0f24 100644 --- a/contrib/x265_8bit/module.defs +++ b/contrib/x265_8bit/module.defs @@ -35,6 +35,7 @@ else endif endif +X265_8.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.host)" ifeq (1,$(HOST.cross)) ifeq (mingw,$(HOST.system)) X265_8.CONFIGURE.extra += -DWIN32=ON @@ -46,15 +47,9 @@ ifeq (1,$(HOST.cross)) 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=$(HOST.cross.prefix)windres - else ifeq ($(HOST.system),darwin) - X265_8.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.host)" - else - X265_8.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_8.CONFIGURE.host)" endif X265_8.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.build)" X265_8.CONFIGURE.extra += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine) -else - X265_8.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.host)" endif ## find CMakeLists.txt |