From 046eb043aeebc31b922f632422b88107e840fd0b Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Tue, 16 Apr 2019 11:31:29 -0600 Subject: make: finish correcting host/build semantics --- contrib/x265_8bit/module.defs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib/x265_8bit') diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs index 4a4411517..88caa4453 100644 --- a/contrib/x265_8bit/module.defs +++ b/contrib/x265_8bit/module.defs @@ -26,8 +26,8 @@ else X265_8.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Release endif -ifeq (1,$(BUILD.cross)) - ifeq (mingw,$(BUILD.system)) +ifeq (1,$(HOST.cross)) + ifeq (mingw,$(HOST.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) @@ -36,7 +36,7 @@ ifeq (1,$(BUILD.cross)) 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 + X265_8.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.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)" -- cgit v1.2.3