diff options
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/hb_json.c | 4 | ||||
| -rw-r--r-- | libhb/module.defs | 22 | ||||
| -rw-r--r-- | libhb/module.rules | 2 | ||||
| -rw-r--r-- | libhb/project.h.m4 | 16 |
4 files changed, 22 insertions, 22 deletions
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 */ |