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 | |
| parent | 8e52e9720f7c5d5b39897f43ae8c6bace5292c19 (diff) | |
make: finish correcting host/build semantics
38 files changed, 145 insertions, 145 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 46ca1d715..abeb88df5 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -58,7 +58,7 @@ FFMPEG.CONFIGURE.extra = \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" -ifeq (1-linux,$(FEATURE.qsv)-$(BUILD.system)) +ifeq (1-linux,$(FEATURE.qsv)-$(HOST.system)) FFMPEG.CONFIGURE.extra += --enable-vaapi FFMPEG.CONFIGURE.extra += --disable-xlib else @@ -80,24 +80,24 @@ FFMPEG.CONFIGURE.extra += \ --enable-muxer=psp \ --enable-muxer=ipod -ifeq (darwin,$(BUILD.system)) +ifeq (darwin,$(HOST.system)) FFMPEG.CONFIGURE.extra += --disable-audiotoolbox --disable-coreimage \ --enable-encoder=h264_videotoolbox \ --enable-encoder=hevc_videotoolbox - ifeq (x86_64,$(BUILD.arch)) + ifeq (x86_64,$(HOST.arch)) FFMPEG.CONFIGURE.extra += --arch=x86_64 endif endif ## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag -ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system)) +ifeq (0-cygwin,$(HOST.cross)-$(HOST.system)) FFMPEG.GCC.args.extra += -fno-common -else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +else ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) FFMPEG.CONFIGURE.extra += \ --target-os=mingw32 \ - --arch=$(BUILD.machine) \ - --cross-prefix=$(BUILD.cross.prefix) \ + --arch=$(HOST.machine) \ + --cross-prefix=$(HOST.cross.prefix) \ --pkg-config=$(PKGCONFIG.exe) FFMPEG.GCC.args.extra += -fno-common endif @@ -137,11 +137,11 @@ endif FFMPEG.BUILD.extra = V=1 ## For POSIX.1-2001 -ifeq (solaris,$(BUILD.system)) +ifeq (solaris,$(HOST.system)) FFMPEG.CONFIGURE.extra += --extra-libs=/usr/lib/values-xpg6.o endif ## MPC8 Doesn't compile on SPARC -ifeq (solaris-sparc,$(BUILD.system)-$(BUILD.machine)) +ifeq (solaris-sparc,$(HOST.system)-$(HOST.machine)) FFMPEG.CONFIGURE.extra += --disable-demuxer=mpc8 endif diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs index ecc59c6a3..2e29553a8 100644 --- a/contrib/fribidi/module.defs +++ b/contrib/fribidi/module.defs @@ -8,8 +8,8 @@ FRIBIDI.FETCH.basename = fribidi-1.0.5.tar.gz FRIBIDI.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv; -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) FRIBIDI.CONFIGURE.extra = --with-glib=no -else ifeq (darwin,$(BUILD.system)) +else ifeq (darwin,$(HOST.system)) FRIBIDI.CONFIGURE.extra = --with-glib=no endif diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs index 6fb3ffcfe..191d4e24f 100644 --- a/contrib/harfbuzz/module.defs +++ b/contrib/harfbuzz/module.defs @@ -15,11 +15,11 @@ HARFBUZZ.CONFIGURE.extra = \ HARFBUZZ.CONFIGURE.extra += --with-fontconfig=no -ifeq ($(BUILD.system),darwin) +ifeq ($(HOST.system),darwin) HARFBUZZ.CONFIGURE.extra += --with-coretext=yes --with-glib=no endif -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) HARFBUZZ.CONFIGURE.extra += --with-directwrite=no --with-glib=no \ --with-gobject=no --with-cairo=no --with-icu=no --with-graphite2=no \ --with-uniscribe=no diff --git a/contrib/lame/module.defs b/contrib/lame/module.defs index 05c8bd013..a874fb3a2 100644 --- a/contrib/lame/module.defs +++ b/contrib/lame/module.defs @@ -10,6 +10,6 @@ ifneq (none,$(FFMPEG.GCC.g)) LAME.CONFIGURE.extra += --enable-debug endif -ifeq (1-msys,$(BUILD.cross)-$(HOST.system)) +ifeq (1-msys,$(HOST.cross)-$(BUILD.system)) LAME.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu endif diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs index 5ab5f9461..139c6711e 100644 --- a/contrib/libass/module.defs +++ b/contrib/libass/module.defs @@ -1,6 +1,6 @@ __deps__ := FREETYPE FRIBIDI HARFBUZZ -ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) +ifeq (,$(filter $(HOST.system),darwin cygwin mingw)) __deps__ += FONTCONFIG endif @@ -17,7 +17,7 @@ LIBASS.CONFIGURE.extra = \ FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \ FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \ -ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) +ifeq (,$(filter $(HOST.system),darwin cygwin mingw)) # Tell configure where to find our version of fontconfig LIBASS.CONFIGURE.extra += \ --enable-fontconfig \ @@ -27,7 +27,7 @@ else LIBASS.CONFIGURE.extra += --disable-fontconfig endif -ifneq ($(BUILD.system),linux) +ifneq ($(HOST.system),linux) LIBASS.CONFIGURE.extra += \ FRIBIDI_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfribidi" \ FRIBIDI_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include" diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs index fcf31d4ee..1dd964ca6 100644 --- a/contrib/libbluray/module.defs +++ b/contrib/libbluray/module.defs @@ -11,11 +11,11 @@ endif LIBBLURAY.CONFIGURE.extra += --disable-doxygen-doc --disable-examples --disable-bdjava-jar --without-freetype --without-fontconfig -ifeq (mingw,$(BUILD.system)) +ifeq (mingw,$(HOST.system)) LIBBLURAY.GCC.D += MINGW_HAS_SECURE_API=1 endif -ifeq (freebsd,$(BUILD.system)) +ifeq (freebsd,$(HOST.system)) LIBBLURAY.GCC.D += _XOPEN_SOURCE=700 endif diff --git a/contrib/libiconv/module.defs b/contrib/libiconv/module.defs index 9c645cc38..be20e6849 100644 --- a/contrib/libiconv/module.defs +++ b/contrib/libiconv/module.defs @@ -5,13 +5,13 @@ LIBICONV.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libicon LIBICONV.FETCH.url += https://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz LIBICONV.FETCH.sha256 = ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 -ifeq (1,$(BUILD.cross)) +ifeq (1,$(HOST.cross)) # this contrib will not build under MinGW with -std=gnu99 - ifeq (mingw,$(BUILD.system)) + ifeq (mingw,$(HOST.system)) LIBICONV.GCC.args.c_std = -std=gnu89 endif - ifeq (msys,$(HOST.system)) + ifeq (msys,$(BUILD.system)) LIBICONV.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu endif endif diff --git a/contrib/libmfx/module.defs b/contrib/libmfx/module.defs index b999aeeb0..2aec1a7af 100644 --- a/contrib/libmfx/module.defs +++ b/contrib/libmfx/module.defs @@ -6,7 +6,7 @@ LIBMFX.FETCH.sha256 = 9dc8bcb67f5df3dfac29a2777c1bdc9ac2bb6b0e68169af4059089f517 LIBMFX.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv; -ifeq (1,$(BUILD.cross)) +ifneq (linux,$(HOST.system)) LIBMFX.CONFIGURE.extra = --without-libva_drm --without-libva_x11 endif diff --git a/contrib/libsamplerate/module.defs b/contrib/libsamplerate/module.defs index f079c66a3..f5d6ac01a 100644 --- a/contrib/libsamplerate/module.defs +++ b/contrib/libsamplerate/module.defs @@ -13,6 +13,6 @@ LIBSAMPLERATE.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; # Disable to avoid Carbon.h dependency on OSX LIBSAMPLERATE.CONFIGURE.extra = --disable-sndfile -ifeq (1-msys,$(BUILD.cross)-$(HOST.system)) +ifeq (1-msys,$(HOST.cross)-$(BUILD.system)) LIBSAMPLERATE.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu endif diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs index 5e4fb57c3..2cd163139 100644 --- a/contrib/libtheora/module.defs +++ b/contrib/libtheora/module.defs @@ -15,6 +15,6 @@ LIBTHEORA.CONFIGURE.extra = \ --with-vorbis=$(call fn.ABSOLUTE,$(CONTRIB.build/)) \ HAVE_PKG_CONFIG=no -ifeq (1-msys,$(BUILD.cross)-$(HOST.system)) +ifeq (1-msys,$(HOST.cross)-$(BUILD.system)) LIBTHEORA.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu endif diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs index d10b0d91b..f4f869f4b 100644 --- a/contrib/libvpx/module.defs +++ b/contrib/libvpx/module.defs @@ -17,29 +17,29 @@ LIBVPX.CONFIGURE.extra = \ --disable-docs \ --disable-unit-tests -ifeq (1,$(BUILD.cross)) - LIBVPX.CONFIGURE.env.CROSS = CROSS="$(BUILD.spec)-" +ifeq (1,$(HOST.cross)) + LIBVPX.CONFIGURE.env.CROSS = CROSS="$(HOST.spec)-" LIBVPX.CONFIGURE.args.build = LIBVPX.CONFIGURE.extra += --enable-static-msvcrt - ifeq (i686,$(BUILD.machine)) + ifeq (i686,$(HOST.machine)) LIBVPX.CONFIGURE.extra += --target=x86-win32-gcc - else ifeq (x86_64,$(BUILD.machine)) + else ifeq (x86_64,$(HOST.machine)) LIBVPX.CONFIGURE.extra += --target=x86_64-win64-gcc endif endif -ifeq (linux,$(BUILD.system)) - ifeq (x86_64,$(BUILD.machine)) +ifeq (linux,$(HOST.system)) + ifeq (x86_64,$(HOST.machine)) LIBVPX.CONFIGURE.extra += --enable-pic endif endif -ifeq (0-darwin,$(BUILD.cross)-$(BUILD.system)) +ifeq (0-darwin,$(HOST.cross)-$(BUILD.system)) ifeq (x86_64,$(BUILD.machine)) LIBVPX.CONFIGURE.extra += --target=x86_64-darwin14-gcc endif endif -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) LIBVPX.CONFIGURE.extra += --disable-avx512 endif diff --git a/contrib/libxml2/module.defs b/contrib/libxml2/module.defs index d6b4f2898..4e2893384 100644 --- a/contrib/libxml2/module.defs +++ b/contrib/libxml2/module.defs @@ -13,6 +13,6 @@ LIBXML2.CONFIGURE.extra = --without-lzma # in the MinGW environment. LIBXML2.CONFIGURE.extra += --without-python --without-threads -ifeq (1-msys,$(BUILD.cross)-$(HOST.system)) +ifeq (1-msys,$(HOST.cross)-$(BUILD.system)) LIBXML2.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu endif diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs index e40703315..f256c3313 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -12,9 +12,9 @@ X264.CONFIGURE.shared = X264.CONFIGURE.extra += --disable-lavf --disable-ffms --disable-avs --disable-swscale --disable-gpac --disable-lsmash --disable-cli -ifeq (1,$(BUILD.cross)) +ifeq (1,$(HOST.cross)) X264.CONFIGURE.build = - X264.CONFIGURE.extra += --cross-prefix=$(BUILD.spec)- + X264.CONFIGURE.extra += --cross-prefix=$(HOST.spec)- X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)" X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)" endif diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs index f3cc1e3a1..ac21f799b 100644 --- a/contrib/x265/module.defs +++ b/contrib/x265/module.defs @@ -42,7 +42,7 @@ X265.SOURCE.libs = \ $(X265.BUILD.dir)/10bit/libx265_main10.a \ $(X265.BUILD.dir)/12bit/libx265_main12.a -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) X265.O.ext = .obj else X265.O.ext = .o diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs index 8b950709a..f6698607d 100644 --- a/contrib/x265_10bit/module.defs +++ b/contrib/x265_10bit/module.defs @@ -29,8 +29,8 @@ else X265_10.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Release endif -ifeq (1,$(BUILD.cross)) - ifeq (mingw,$(BUILD.system)) +ifeq (1,$(HOST.cross)) + ifeq (mingw,$(HOST.system)) X265_10.CONFIGURE.extra += -DWIN32=ON X265_10.CONFIGURE.extra += -DCMAKE_SYSTEM_NAME=Windows X265_10.CONFIGURE.extra += -DCMAKE_C_COMPILER=$(X265_10.GCC.gcc) @@ -39,7 +39,7 @@ ifeq (1,$(BUILD.cross)) X265_10.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(X265_10.GCC.gxx) 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=$(BUILD.cross.prefix)windres + X265_10.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres 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)" 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)" 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)" diff --git a/contrib/zlib/module.defs b/contrib/zlib/module.defs index f973bcfec..6f19b8130 100644 --- a/contrib/zlib/module.defs +++ b/contrib/zlib/module.defs @@ -7,7 +7,7 @@ ZLIB.FETCH.sha256 = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197 ZLIB.CONFIGURE.args = !sete @dir !env !exe @prefix !extra -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) ZLIB.CONFIGURE.env.AR = AR="$(AR.exe)" ZLIB.CONFIGURE.env.ARFLAGS = ARFLAGS="rc" ZLIB.CONFIGURE.env.RANLIB = RANLIB="$(RANLIB.exe)" diff --git a/gtk/module.defs b/gtk/module.defs index 2f1e5a021..ec3f697f5 100644 --- a/gtk/module.defs +++ b/gtk/module.defs @@ -14,8 +14,8 @@ BUILD.out += $(GTK.out) ############################################################################### -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) -GTK.CONFIGURE.extra += --host=$(BUILD.spec) +ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) +GTK.CONFIGURE.extra += --host=$(HOST.spec) ifeq ($(HAS.dlfcn),1) GTK.CONFIGURE.extra += --enable-dl endif diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index c23ad3c3c..7024b4311 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -4609,7 +4609,7 @@ about_action_cb(GSimpleAction *action, GVariant *param, signal_user_data_t *ud) GtkWidget *widget = GHB_WIDGET (ud->builder, "hb_about"); gchar *ver; - ver = g_strdup_printf("%s (%s)", HB_PROJECT_VERSION, HB_PROJECT_BUILD_ARCH); + ver = g_strdup_printf("%s (%s)", HB_PROJECT_VERSION, HB_PROJECT_HOST_ARCH); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), ver); g_free(ver); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), diff --git a/gtk/src/main.c b/gtk/src/main.c index dd86cf242..dc064ac5d 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -1034,7 +1034,7 @@ ghb_activate_cb(GApplication * app, signal_user_data_t * ud) ghb_preview_init(ud); IoRedirect(ud); ghb_log( "%s - %s - %s", - HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE ); + HB_PROJECT_TITLE, HB_PROJECT_HOST_TITLE, HB_PROJECT_URL_WEBSITE ); ghb_init_dep_map(); GtkTextView * textview; diff --git a/libhb/hb_json.c b/libhb/hb_json.c index bdf1ed080..7433089f0 100644 --- a/libhb/hb_json.c +++ b/libhb/hb_json.c @@ -135,8 +135,8 @@ hb_dict_t * hb_version_dict() "VersionString", hb_value_string(HB_PROJECT_VERSION), "RepoHash", hb_value_string(HB_PROJECT_REPO_HASH), "RepoDate", hb_value_string(HB_PROJECT_REPO_DATE), - "System", hb_value_string(HB_PROJECT_BUILD_SYSTEMF), - "Arch", hb_value_string(HB_PROJECT_BUILD_ARCH)); + "System", hb_value_string(HB_PROJECT_HOST_SYSTEMF), + "Arch", hb_value_string(HB_PROJECT_HOST_ARCH)); if (dict == NULL) { hb_error("json pack failure: %s", error.text); diff --git a/libhb/module.defs b/libhb/module.defs index aa9964e9e..a97b59d94 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -3,7 +3,7 @@ __deps__ := A52DEC BZIP2 LIBVPX FFMPEG FREETYPE LAME LIBASS LIBDCA \ LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON \ HARFBUZZ LIBOPUS LIBSPEEX -ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) +ifeq (,$(filter $(HOST.system),darwin cygwin mingw)) __deps__ += FONTCONFIG endif @@ -48,32 +48,32 @@ endif LIBHB.GCC.D += __LIBHB__ USE_PTHREAD LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include -ifeq ($(BUILD.system),freebsd) +ifeq ($(HOST.system),freebsd) LIBHB.GCC.I += $(LOCALBASE)/include LIBHB.GCC.I += $(LOCALBASE)/include/libxml2 -else ifneq (,$(filter $(BUILD.system),darwin cygwin mingw)) +else ifneq (,$(filter $(HOST.system),darwin cygwin mingw)) LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2 else LIBHB.GCC.I += /usr/include/libxml2 endif -ifeq ($(BUILD.system),cygwin) +ifeq ($(HOST.system),cygwin) LIBHB.GCC.D += SYS_CYGWIN -else ifeq ($(BUILD.system),darwin) +else ifeq ($(HOST.system),darwin) LIBHB.GCC.D += SYS_DARWIN LIBHB.c += $(wildcard $(LIBHB.src/)platform/macosx/*.c) LIBHB.m += $(wildcard $(LIBHB.src/)platform/macosx/*.m) -else ifeq ($(BUILD.system),linux) +else ifeq ($(HOST.system),linux) LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64 -else ifeq ($(BUILD.system),freebsd) +else ifeq ($(HOST.system),freebsd) LIBHB.GCC.D += SYS_FREEBSD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64 -else ifeq ($(BUILD.system),mingw) +else ifeq ($(HOST.system),mingw) LIBHB.GCC.D += SYS_MINGW ifneq ($(HAS.pthread),1) LIBHB.GCC.D += PTW32_STATIC_LIB endif LIBHB.GCC.args.extra.dylib++ += -Wl,--enable-auto-import -static -else ifeq ($(BUILD.system),solaris) +else ifeq ($(HOST.system),solaris) LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64 _POSIX_C_SOURCE=200112L __EXTENSIONS__ else LIBHB.platform.D = SYS_UNKNOWN @@ -104,13 +104,13 @@ ifeq (1,$(HAS.strerror_r)) endif ## required for <libdvdread/*.h> -ifneq (,$(filter $(BUILD.arch),ppc ppc64)) +ifneq (,$(filter $(HOST.arch),ppc ppc64)) LIBHB.GCC.D += WORDS_BIGENDIAN endif ############################################################################### -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) LIBHB.dll = $(LIBHB.build/)hb.dll LIBHB.lib = $(LIBHB.build/)hb.lib diff --git a/libhb/module.rules b/libhb/module.rules index 91dc7833f..63be2374d 100644 --- a/libhb/module.rules +++ b/libhb/module.rules @@ -28,7 +28,7 @@ libhb.clean: ############################################################################### -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) libhb.build: $(LIBHB.dll) diff --git a/libhb/project.h.m4 b/libhb/project.h.m4 index ae54f255c..c5de4f04a 100644 --- a/libhb/project.h.m4 +++ b/libhb/project.h.m4 @@ -30,13 +30,13 @@ dnl <<#>>define HB_PROJECT_REPO_OFFICIAL __HB_repo_official <<#>>define HB_PROJECT_REPO_DATE "__HB_repo_date" -<<#>>define HB_PROJECT_BUILD_SPEC "__BUILD_spec" -<<#>>define HB_PROJECT_BUILD_MACHINE "__BUILD_machine" -<<#>>define HB_PROJECT_BUILD_VENDOR "__BUILD_vendor" -<<#>>define HB_PROJECT_BUILD_SYSTEM "__BUILD_system" -<<#>>define HB_PROJECT_BUILD_SYSTEMF "__BUILD_systemf" -<<#>>define HB_PROJECT_BUILD_RELEASE "__BUILD_release" -<<#>>define HB_PROJECT_BUILD_TITLE "__BUILD_title" -<<#>>define HB_PROJECT_BUILD_ARCH "__BUILD_arch" +<<#>>define HB_PROJECT_HOST_SPEC "__HOST_spec" +<<#>>define HB_PROJECT_HOST_MACHINE "__HOST_machine" +<<#>>define HB_PROJECT_HOST_VENDOR "__HOST_vendor" +<<#>>define HB_PROJECT_HOST_SYSTEM "__HOST_system" +<<#>>define HB_PROJECT_HOST_SYSTEMF "__HOST_systemf" +<<#>>define HB_PROJECT_HOST_RELEASE "__HOST_release" +<<#>>define HB_PROJECT_HOST_TITLE "__HOST_title" +<<#>>define HB_PROJECT_HOST_ARCH "__HOST_arch" #endif /* HB_PROJECT_PROJECT_H */ diff --git a/make/configure.py b/make/configure.py index 7523e4679..8f1154690 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1917,36 +1917,36 @@ int main() doc.add( 'HB.repo.date', repo.date.strftime("%Y-%m-%d %H:%M:%S") ) doc.addBlank() - doc.add( 'HOST.spec', build_tuple.spec ) - doc.add( 'HOST.machine', build_tuple.machine ) - doc.add( 'HOST.vendor', build_tuple.vendor ) - doc.add( 'HOST.system', build_tuple.system ) - doc.add( 'HOST.systemf', build_tuple.systemf ) - doc.add( 'HOST.release', build_tuple.release ) - doc.add( 'HOST.extra', build_tuple.extra ) - doc.add( 'HOST.title', '%s %s' % (build_tuple.systemf,arch.mode.default) ) - doc.add( 'HOST.ncpu', core.count ) + doc.add( 'BUILD.spec', build_tuple.spec ) + doc.add( 'BUILD.machine', build_tuple.machine ) + doc.add( 'BUILD.vendor', build_tuple.vendor ) + doc.add( 'BUILD.system', build_tuple.system ) + doc.add( 'BUILD.systemf', build_tuple.systemf ) + doc.add( 'BUILD.release', build_tuple.release ) + doc.add( 'BUILD.extra', build_tuple.extra ) + doc.add( 'BUILD.title', '%s %s' % (build_tuple.systemf,arch.mode.default) ) + doc.add( 'BUILD.ncpu', core.count ) + doc.add( 'BUILD.date', time.strftime('%c', now) ), doc.addBlank() - doc.add( 'BUILD.spec', host_tuple.spec ) - doc.add( 'BUILD.machine', host_tuple.machine ) - doc.add( 'BUILD.vendor', host_tuple.vendor ) - doc.add( 'BUILD.system', host_tuple.system ) - doc.add( 'BUILD.systemf', host_tuple.systemf ) - doc.add( 'BUILD.release', host_tuple.release ) - doc.add( 'BUILD.extra', host_tuple.extra ) - doc.add( 'BUILD.title', host_tuple.title ) - doc.add( 'BUILD.ncpu', core.count ) - doc.add( 'BUILD.jobs', core.jobs ) + doc.add( 'HOST.spec', host_tuple.spec ) + doc.add( 'HOST.machine', host_tuple.machine ) + doc.add( 'HOST.vendor', host_tuple.vendor ) + doc.add( 'HOST.system', host_tuple.system ) + doc.add( 'HOST.systemf', host_tuple.systemf ) + doc.add( 'HOST.release', host_tuple.release ) + doc.add( 'HOST.extra', host_tuple.extra ) + doc.add( 'HOST.title', host_tuple.title ) + doc.add( 'HOST.ncpu', core.count ) + doc.add( 'HOST.jobs', core.jobs ) - doc.add( 'BUILD.cross', int(options.cross != None or arch.mode.mode != arch.mode.default) ) + doc.add( 'HOST.cross', int(options.cross != None or arch.mode.mode != arch.mode.default) ) if options.cross: - doc.add( 'BUILD.cross.prefix', '%s-' % (options.cross) ) + doc.add( 'HOST.cross.prefix', '%s-' % (options.cross) ) else: - doc.add( 'BUILD.cross.prefix', '' ) + doc.add( 'HOST.cross.prefix', '' ) - doc.add( 'BUILD.date', time.strftime('%c', now) ), - doc.add( 'BUILD.arch', arch.mode.mode ) + doc.add( 'HOST.arch', arch.mode.mode ) doc.addBlank() doc.add( 'SRC', cfg.src_final ) diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 062135f7b..bb7500492 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -1,7 +1,7 @@ CONTRIB.build/ = $(BUILD/)contrib/ CONTRIB.download/ = $(SRC/)download/ -CONTRIB.host = $(if $(filter 1,$(BUILD.cross)),$(BUILD.spec)) -CONTRIB.spec = $(if $(filter 1,$(BUILD.cross)),$(HOST.spec)) +CONTRIB.host = $(if $(filter 1,$(HOST.cross)),$(HOST.spec)) +CONTRIB.spec = $(if $(filter 1,$(HOST.cross)),$(BUILD.spec)) ############################################################################### @@ -69,7 +69,7 @@ define import.CONTRIB.defs ## $(1).PATCH.srcs = $$(sort $$(wildcard \ $$($(1).src/)A??-*.patch \ - $$($(1).src/)P??-$$(BUILD.system)*.patch )) + $$($(1).src/)P??-$$(HOST.system)*.patch )) # extra line feed is required define $(1).PATCH.item diff --git a/make/include/gcc.defs b/make/include/gcc.defs index 83b26aafa..7a67f4b2f 100644 --- a/make/include/gcc.defs +++ b/make/include/gcc.defs @@ -47,7 +47,7 @@ GCC.args.dylib = -dynamiclib GCC.args.ML = -fmessage-length=0 GCC.args.H = -H GCC.args.W = -W$(1) -ifeq (darwin,$(BUILD.system)) +ifeq (darwin,$(HOST.system)) GCC.args.archs = -arch $(1) endif GCC.args.sysroot = --sysroot=$(1) @@ -73,7 +73,7 @@ GCC.args.L = -L$(1) GCC.args.l = -l$(1) GCC.args.end = -Wl,--end-group -ifeq ($(BUILD.machine),$(filter $(BUILD.machine),i686 x86_64)) +ifeq ($(HOST.machine),$(filter $(HOST.machine),i686 x86_64)) GCC.args.extra = $(CFLAGS) $(CPPFLAGS) -mfpmath=sse -msse2 else GCC.args.extra = $(CFLAGS) $(CPPFLAGS) diff --git a/make/include/main.defs b/make/include/main.defs index 5a5118e60..dda33acdf 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -7,13 +7,13 @@ include $(SRC/)make/include/tool.defs ############################################################################### -ifneq (,$(filter $(BUILD.system),cygwin mingw)) +ifneq (,$(filter $(HOST.system),cygwin mingw)) ifneq ($(HAS.bz2),1) MODULES += contrib/bzip2 endif endif -ifneq (,$(filter $(BUILD.system),darwin cygwin mingw)) +ifneq (,$(filter $(HOST.system),darwin cygwin mingw)) MODULES += contrib/freetype MODULES += contrib/fribidi MODULES += contrib/harfbuzz @@ -64,11 +64,11 @@ ifeq (1,$(FEATURE.nvenc)) MODULES += contrib/nvenc endif -ifneq (,$(filter $(BUILD.system),darwin)) +ifneq (,$(filter $(HOST.system),darwin)) MODULES += contrib/xz endif -ifneq (,$(filter $(BUILD.system),cygwin mingw)) +ifneq (,$(filter $(HOST.system),cygwin mingw)) ifneq ($(HAS.iconv),1) MODULES += contrib/libiconv endif @@ -83,7 +83,7 @@ ifneq ($(HAS.regex),1) endif endif -ifneq (,$(filter $(BUILD.system),solaris)) +ifneq (,$(filter $(HOST.system),solaris)) MODULES += contrib/libiconv endif @@ -93,7 +93,7 @@ MODULES += libhb ############################################################################### -ifeq (1-darwin,$(FEATURE.xcode)-$(BUILD.system)) +ifeq (1-darwin,$(FEATURE.xcode)-$(HOST.system)) ## use macosx module when xcode+darwin MODULES += macosx else @@ -101,26 +101,26 @@ else MODULES += test endif -ifeq (1-mingw,$(FEATURE.gtk.mingw)-$(BUILD.system)) +ifeq (1-mingw,$(FEATURE.gtk.mingw)-$(HOST.system)) MODULES += gtk endif -ifeq (1-linux,$(FEATURE.gtk)-$(BUILD.system)) +ifeq (1-linux,$(FEATURE.gtk)-$(HOST.system)) ## build gtk when gtk+linux MODULES += gtk endif -ifeq (1-freebsd,$(FEATURE.gtk)-$(BUILD.system)) +ifeq (1-freebsd,$(FEATURE.gtk)-$(HOST.system)) ## build gtk when gtk+freebsd MODULES += gtk endif -ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system)) +ifeq (1-kfreebsd,$(FEATURE.gtk)-$(HOST.system)) ## build gtk when gtk+kfreebsd MODULES += gtk endif -ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.system)) +ifeq (1-gnu,$(FEATURE.gtk)-$(HOST.system)) ## build gtk when gtk+gnu MODULES += gtk endif @@ -132,5 +132,5 @@ MODULES += pkg ############################################################################### include $(MODULES:%=$(SRC/)%/module.defs) -include $(SRC/)make/variant/$(BUILD.system).defs --include $(SRC/)make/variant/$(BUILD.system).$(BUILD.machine).defs +include $(SRC/)make/variant/$(HOST.system).defs +-include $(SRC/)make/variant/$(HOST.system).$(HOST.machine).defs diff --git a/make/include/main.rules b/make/include/main.rules index 6c3cbb05b..14df5b034 100644 --- a/make/include/main.rules +++ b/make/include/main.rules @@ -35,8 +35,8 @@ mrproper: xclean include $(SRC/)make/include/base.rules include $(MODULES:%=$(SRC/)%/module.rules) --include $(SRC/)make/variant/$(BUILD.system).rules --include $(SRC/)make/variant/$(BUILD.system).$(BUILD.machine).rules +-include $(SRC/)make/variant/$(HOST.system).rules +-include $(SRC/)make/variant/$(HOST.system).$(HOST.machine).rules ############################################################################### diff --git a/pkg/darwin/module.rules b/pkg/darwin/module.rules index b0e21301a..4124e36ea 100644 --- a/pkg/darwin/module.rules +++ b/pkg/darwin/module.rules @@ -20,7 +20,7 @@ $(PKG.cli.dmg): | $(STAGE.out.cli/) $(PKG.gui.dmg): | $(dir $(PKG.gui.dmg)) $(PKG.gui.dmg): | $(STAGE.out.gui/) -ifeq (1-darwin,$(FEATURE.xcode)-$(BUILD.system)) +ifeq (1-darwin,$(FEATURE.xcode)-$(HOST.system)) hdiutil create -srcfolder $(STAGE.out.gui/) -fs HFS+ -format UDRO -mode 755 \ -volname $(basename $(notdir $@)) \ -ov $(PKG.gui.tmp.dmg) @@ -32,7 +32,7 @@ endif $(STAGE.out.cli/): $(MKDIR.exe) -p $@ -ifeq (1-darwin,$(FEATURE.xcode)-$(BUILD.system)) +ifeq (1-darwin,$(FEATURE.xcode)-$(HOST.system)) $(CP.exe) $(XCODE.symroot)/HandBrakeCLI $(STAGE.out.cli/) $(call STAGE.doc,$(STAGE.out.cli/)) else @@ -42,7 +42,7 @@ endif $(STAGE.out.gui/): $(MKDIR.exe) -p $@ -ifeq (1-darwin,$(FEATURE.xcode)-$(BUILD.system)) +ifeq (1-darwin,$(FEATURE.xcode)-$(HOST.system)) $(CP.exe) -R $(XCODE.symroot)/HandBrake.app $(STAGE.out.gui/) $(call STAGE.doc,$(STAGE.out.gui/)) endif diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs index 939a62410..43729991b 100644 --- a/pkg/linux/module.defs +++ b/pkg/linux/module.defs @@ -25,7 +25,7 @@ endif ############################################################################### -PKG.cli.tar = $(PKG.out.abs/)$(HB.name)-$(HB.version)-$(BUILD.machine)_CLI.tar.gz +PKG.cli.tar = $(PKG.out.abs/)$(HB.name)-$(HB.version)-$(HOST.machine)_CLI.tar.gz STAGE.out.cli/ = $(STAGE.out.abs/)cli/ @@ -36,8 +36,8 @@ PKG.rpm.src.tar.bz2 = $(STAGE.out.src.abs/)rpm/$(PKG.rpm.basename).tar.bz2 STAGE.out.rpm.src/ = $(STAGE.out.src.abs/)rpm/ PKG.debian = $(PKG.in.abs/)linux/debian -PKG.cli.deb = $(PKG.out.abs/)$(HB.name)-$(HB.debversion)-Ubuntu_CLI_$(BUILD.machine).deb -PKG.gui.deb = $(PKG.out.abs/)$(HB.name)-$(HB.debversion)-Ubuntu_GUI_$(BUILD.machine).deb +PKG.cli.deb = $(PKG.out.abs/)$(HB.name)-$(HB.debversion)-Ubuntu_CLI_$(HOST.machine).deb +PKG.gui.deb = $(PKG.out.abs/)$(HB.name)-$(HB.debversion)-Ubuntu_GUI_$(HOST.machine).deb PKG.deb.basename = $(HB.name.lower)-$(HB.debversion) PKG.src.deb.tar = $(HB.name.lower)_$(HB.debversion).tar.gz PKG.src.deb.stamp = $(STAGE.out.src.abs/).debsrc.stamp @@ -89,22 +89,22 @@ PKG.gui.name.flatpak = fr.handbrake.ghb PKG.gui.manifest.flathub = $(PKG.out.flatpak/)$(PKG.gui.name.flatpak).json PKG.gui.template.flatpak = $(PKG.flatpak/)$(PKG.gui.name.flatpak).json PKG.gui.manifest.flatpak = $(STAGE.out.flatpak/)$(PKG.gui.name.flatpak).json -PKG.gui.build.flatpak = $(STAGE.out.flatpak/)$(PKG.gui.name.flatpak)-$(HB.version)-$(BUILD.machine).build -PKG.gui.flatpak = $(PKG.out.flatpak/)$(PKG.gui.name.flatpak)-$(HB.version)-$(BUILD.machine).flatpak +PKG.gui.build.flatpak = $(STAGE.out.flatpak/)$(PKG.gui.name.flatpak)-$(HB.version)-$(HOST.machine).build +PKG.gui.flatpak = $(PKG.out.flatpak/)$(PKG.gui.name.flatpak)-$(HB.version)-$(HOST.machine).flatpak PKG.cli.name.flatpak = fr.handbrake.HandBrakeCLI PKG.cli.manifest.flathub = $(PKG.out.flatpak/)$(PKG.cli.name.flatpak).json PKG.cli.template.flatpak = $(PKG.flatpak/)$(PKG.cli.name.flatpak).json PKG.cli.manifest.flatpak = $(STAGE.out.flatpak/)$(PKG.cli.name.flatpak).json -PKG.cli.build.flatpak = $(STAGE.out.flatpak/)$(PKG.cli.name.flatpak)-$(HB.version)-$(BUILD.machine).build -PKG.cli.flatpak = $(PKG.out.flatpak/)$(PKG.cli.name.flatpak)-$(HB.version)-$(BUILD.machine).flatpak +PKG.cli.build.flatpak = $(STAGE.out.flatpak/)$(PKG.cli.name.flatpak)-$(HB.version)-$(HOST.machine).build +PKG.cli.flatpak = $(PKG.out.flatpak/)$(PKG.cli.name.flatpak)-$(HB.version)-$(HOST.machine).flatpak PKG.mediasdk.name.flatpak = fr.handbrake.plugin.IntelMediaSDK PKG.mediasdk.manifest.flathub = $(PKG.out.flatpak/)$(PKG.mediasdk.name.flatpak).json PKG.mediasdk.template.flatpak = $(PKG.flatpak/)$(PKG.mediasdk.name.flatpak).json PKG.mediasdk.manifest.flatpak = $(STAGE.out.flatpak/)$(PKG.mediasdk.name.flatpak).json -PKG.mediasdk.build.flatpak = $(STAGE.out.flatpak/)$(PKG.mediasdk.name.flatpak)-$(HB.version)-$(BUILD.machine).build -PKG.mediasdk.flatpak = $(PKG.out.flatpak/)$(PKG.mediasdk.name.flatpak)-$(HB.version)-$(BUILD.machine).flatpak +PKG.mediasdk.build.flatpak = $(STAGE.out.flatpak/)$(PKG.mediasdk.name.flatpak)-$(HB.version)-$(HOST.machine).build +PKG.mediasdk.flatpak = $(PKG.out.flatpak/)$(PKG.mediasdk.name.flatpak)-$(HB.version)-$(HOST.machine).flatpak PKG.all.flatpak = $(PKG.gui.flatpak) $(PKG.cli.flatpak) ifeq (1,$(FEATURE.qsv)) diff --git a/pkg/mingw/module.defs b/pkg/mingw/module.defs index e7cbe951f..b0d0ea83c 100644 --- a/pkg/mingw/module.defs +++ b/pkg/mingw/module.defs @@ -1,7 +1,7 @@ PKG.platname = win -PKG.cli.zip = $(PKG.out/)$(HB.name)CLI-$(HB.version)-$(PKG.platname)-$(BUILD.machine).zip -PKG.libhb.zip = $(PKG.out/)LibHB-$(HB.version)-$(PKG.platname)-$(BUILD.machine).zip +PKG.cli.zip = $(PKG.out/)$(HB.name)CLI-$(HB.version)-$(PKG.platname)-$(HOST.machine).zip +PKG.libhb.zip = $(PKG.out/)LibHB-$(HB.version)-$(PKG.platname)-$(HOST.machine).zip PKG.mingw.lib = $(SRC/)libraries STAGE.out.cli/ = $(STAGE.out/)cli/ diff --git a/pkg/module.defs b/pkg/module.defs index 9ab47ac0c..a1e2fcf1e 100644 --- a/pkg/module.defs +++ b/pkg/module.defs @@ -30,4 +30,4 @@ BUILD.out += $(PKG.src.tar.bz2) ############################################################################### ## include optional platform packaging --include $(SRC/)pkg/$(BUILD.system)/module.defs +-include $(SRC/)pkg/$(HOST.system)/module.defs diff --git a/pkg/module.rules b/pkg/module.rules index 8bb7a81e5..e3d822545 100644 --- a/pkg/module.rules +++ b/pkg/module.rules @@ -28,4 +28,4 @@ $(PKG.src-contrib.tar.bz2): ############################################################################### ## include optional platform packaging --include $(SRC/)pkg/$(BUILD.system)/module.rules +-include $(SRC/)pkg/$(HOST.system)/module.rules diff --git a/test/module.defs b/test/module.defs index 0f7a16427..c477ad1ef 100644 --- a/test/module.defs +++ b/test/module.defs @@ -19,14 +19,14 @@ TEST.GCC.l = \ samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \ bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma -ifeq (,$(filter $(BUILD.system),darwin cygwin mingw)) +ifeq (,$(filter $(HOST.system),darwin cygwin mingw)) TEST.GCC.l += fontconfig endif ifeq (1,$(FEATURE.qsv)) TEST.GCC.D += USE_QSV HAVE_THREADS=1 TEST.GCC.l += mfx -ifeq ($(BUILD.system),linux) +ifeq ($(HOST.system),linux) TEST.GCC.l += va va-drm endif endif @@ -74,26 +74,26 @@ endif TEST.GCC.I += $(LIBHB.GCC.I) -ifeq ($(BUILD.system),darwin) +ifeq ($(HOST.system),darwin) TEST.GCC.f += IOKit CoreServices CoreText CoreGraphics AudioToolbox VideoToolbox CoreMedia CoreVideo Foundation TEST.GCC.l += iconv -else ifeq ($(BUILD.system),linux) +else ifeq ($(HOST.system),linux) TEST.GCC.l += pthread dl m ifeq (1, $(FEATURE.numa)) TEST.GCC.l += numa endif -else ifeq ($(BUILD.system),kfreebsd) +else ifeq ($(HOST.system),kfreebsd) TEST.GCC.l += pthread dl m -else ifeq ($(BUILD.system),freebsd) +else ifeq ($(HOST.system),freebsd) TEST.GCC.L += $(LOCALBASE)/lib TEST.GCC.l += pthread m -else ifeq ($(BUILD.system),solaris) +else ifeq ($(HOST.system),solaris) TEST.GCC.l += pthread nsl socket -ifneq (,$(filter $(BUILD.release),2.10)) +ifneq (,$(filter $(HOST.release),2.10)) TEST.GCC.l += iconv endif TEST.GCC.D += _POSIX_C_SOURCE=200112L __EXTENSIONS__ -else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +else ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) ifeq ($(HAS.dlfcn),1) TEST.GCC.l += dl endif @@ -105,4 +105,4 @@ endif TEST.GCC.l += bcrypt iconv ws2_32 regex uuid ole32 TEST.GCC.D += PTW32_STATIC_LIB TEST.GCC.args.extra.exe++ += -static -endif # (1-mingw,$(BUILD.cross)-$(BUILD.system)) +endif # (1-mingw,$(HOST.cross)-$(HOST.system)) diff --git a/test/module.rules b/test/module.rules index 87640c9de..16e2e1c4d 100644 --- a/test/module.rules +++ b/test/module.rules @@ -46,7 +46,7 @@ $(TEST.exe): | $(dir $(TEST.exe)) $(TEST.exe): $(TEST.c.o) $(call TEST.GCC.EXE++,$@,$^ $(TEST.libs)) ifeq (none,$(FFMPEG.GCC.g)) -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) $(STRIP.exe) -s $(TEST.exe) else $(STRIP.exe) $(TEST.exe) diff --git a/test/test.c b/test/test.c index c2b02cc84..75e938178 100644 --- a/test/test.c +++ b/test/test.c @@ -509,7 +509,7 @@ int main( int argc, char ** argv ) /* Show version */ fprintf( stderr, "%s - %s - %s\n", - HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE ); + HB_PROJECT_TITLE, HB_PROJECT_HOST_TITLE, HB_PROJECT_URL_WEBSITE ); /* Geeky */ fprintf( stderr, "%d CPU%s detected\n", hb_get_cpu_count(), |