diff options
| author | Rodeo <[email protected]> | 2014-03-13 02:17:20 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-03-13 02:17:20 +0000 |
| commit | b775c903f89b910d0d0cf286e3ca722e5f53b96a (patch) | |
| tree | c3bb3a8d333e94ebd482feca633a478b12426a50 /contrib | |
| parent | e7e723d6b670490af67d64dc88bda69d5bdb8fbe (diff) | |
x265: set CMAKE_HOST_SYSTEM instead of just removing --build.
Inetrestingly, host/build seems inverted in cmake compared
to autotools (and actually matches our build system).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6108 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/x265/module.defs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs index 826904436..0d74842b4 100644 --- a/contrib/x265/module.defs +++ b/contrib/x265/module.defs @@ -5,16 +5,16 @@ X265.FETCH.url = http://download.handbrake.fr/contrib/x265-6321-8a84c10e5116.tar X265.CONFIGURE.exe = cmake X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)" -X265.CONFIGURE.build = X265.CONFIGURE.deps = X265.CONFIGURE.static = X265.CONFIGURE.shared = -DENABLE_SHARED=OFF X265.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF ifeq (1,$(BUILD.cross)) - X265.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265.CONFIGURE.host)" + X265.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265.CONFIGURE.host)" + X265.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265.CONFIGURE.build)" else - X265.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265.CONFIGURE.host)" + X265.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265.CONFIGURE.host)" ifeq (1,$(FEATURE.local_yasm)) X265.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" X265.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" |