diff --git a/acinclude.m4 b/acinclude.m4 index 017bbad65..55912de23 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -29,11 +29,6 @@ if test "$DEBUG" = "yes"; then AC_DEFINE(DEBUG, 1, [enable debugging code]) fi -AC_ARG_ENABLE(reschange, - AS_HELP_STRING([--enable-reschange], [enable to change osd resolution]), - AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])) -AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes") - AC_MSG_CHECKING(target) if test "$TARGET" = "native"; then @@ -608,13 +603,6 @@ case "$BOXMODEL" in ;; esac AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true") - -# BOXMODELs that allows to change osd resolution -case "$BOXMODEL" in - hd2|hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|protek4k|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro) - AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]) - ;; -esac ]) dnl backward compatiblity diff --git a/configure.ac b/configure.ac index 369fbae1f..150a9d050 100644 --- a/configure.ac +++ b/configure.ac @@ -442,6 +442,26 @@ AC_ARG_WITH(default-oled-theme, [default_oled_theme=""]) AC_DEFINE_UNQUOTED([DEFAULT_OLED_THEME], ["$default_oled_theme"], [default theme for oled]) +AC_ARG_ENABLE(change-osd-resolution, + AS_HELP_STRING([--enable-change-osd-resolution], [enable to change osd resolution @<:@default=yes@:>@]]), + [enable_change_osd_resolution="$enableval"], + [enable_change_osd_resolution="yes"]) + +# BOXMODELs that *not* allows to change osd resolution +case "$BOXMODEL" in + hd1) + if test "$enable_change_osd_resolution" = "yes"; then + AC_MSG_WARN([--enable-change-osd-resolution=yes is not allowed for boxmodel $BOXMODEL]) + enable_change_osd_resolution="no" + fi + ;; +esac + +if test "$enable_change_osd_resolution" = "yes"; then + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]) +fi +AM_CONDITIONAL(ENABLE_CHANGE_OSD_RESOLUTION, test "$enable_change_osd_resolution" = "yes") + AC_ARG_WITH(stb-hal-includes, AS_HELP_STRING([--with-stb-hal-includes=PATH], [path to libstb-hal includes [[NONE]]]), [STB_HAL_INC="$withval"],