diff options
| author | Martin Storsjö <[email protected]> | 2020-02-13 21:41:48 +0200 |
|---|---|---|
| committer | Scott <[email protected]> | 2020-03-03 20:58:41 +0000 |
| commit | bc4a502dfab17ee88d5d2c12c7d91bb5e85bdb39 (patch) | |
| tree | 411f0fa58681341cc0302c529a39ecf6a3477d50 /contrib/x265_10bit | |
| parent | af222533d3784c085739aa5b4820a679e1affcb5 (diff) | |
contrib: x265: Don't redundantly set CMAKE_SYSTEM_NAME to the triple when cross compiling for windows
It's already explicitly set to "Windows" in these cases, and CMake
does recognize CMAKE_SYSTEM_NAME being set to "Windows", but
might not recognize generic triples.
Diffstat (limited to 'contrib/x265_10bit')
| -rw-r--r-- | contrib/x265_10bit/module.defs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs index bfff6d24d..56a8ebf15 100644 --- a/contrib/x265_10bit/module.defs +++ b/contrib/x265_10bit/module.defs @@ -48,8 +48,9 @@ ifeq (1,$(HOST.cross)) 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=$(HOST.cross.prefix)windres + else + X265_10.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_10.CONFIGURE.host)" 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)" else X265_10.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.host)" |