diff options
| author | John Stebbins <[email protected]> | 2019-04-16 11:31:29 -0600 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2019-04-17 07:27:17 -0600 |
| commit | 046eb043aeebc31b922f632422b88107e840fd0b (patch) | |
| tree | da5955574f4a2029a29ceed0e10ae06625978037 /contrib/x265_12bit/module.defs | |
| parent | 8e52e9720f7c5d5b39897f43ae8c6bace5292c19 (diff) | |
make: finish correcting host/build semantics
Diffstat (limited to 'contrib/x265_12bit/module.defs')
| -rw-r--r-- | contrib/x265_12bit/module.defs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs index b8827a93a..b7fcfff70 100644 --- a/contrib/x265_12bit/module.defs +++ b/contrib/x265_12bit/module.defs @@ -29,8 +29,8 @@ else X265_12.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Release endif -ifeq (1,$(BUILD.cross)) - ifeq (mingw,$(BUILD.system)) +ifeq (1,$(HOST.cross)) + ifeq (mingw,$(HOST.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) @@ -39,7 +39,7 @@ ifeq (1,$(BUILD.cross)) 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 + X265_12.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.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)" |