diff options
| author | Memphiz <memphis@machzwo.de> | 2013-01-31 23:09:30 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2013-01-31 23:11:33 +0100 |
| commit | 14f4952a581290c46e19da88260dc83df4d635b8 (patch) | |
| tree | 2938e84b5c4ce4dfa613fc98feeeece8fd4fbb7b | |
| parent | 2dd0b3de92fa1082eb13420796123f74ccd194a1 (diff) | |
[configure] - make fishbmc optional and default to autodetect (fixes build for gles platforms after fishbmc injection)
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | configure.in | 25 |
2 files changed, 30 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index d7ee22a5db..d4fb12fb8b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -194,8 +194,11 @@ ifneq (@DISABLE_RSXS@,1) endif VIS_DIRS=xbmc/visualizations/OpenGLSpectrum \ - xbmc/visualizations/WaveForm \ - xbmc/visualizations/fishBMC + xbmc/visualizations/WaveForm + +ifneq (@DISABLE_FISHBMC@,1) + VIS_DIRS+= xbmc/visualizations/fishBMC +endif ifneq (@DISABLE_PROJECTM@,1) VIS_DIRS+= xbmc/visualizations/XBMCProjectM diff --git a/configure.in b/configure.in index fb0a4c5fca..badc57d01b 100644 --- a/configure.in +++ b/configure.in @@ -105,6 +105,8 @@ goom_disabled="== GOOM disabled. ==" alsa_disabled="== ALSA support disabled. ==" rsxs_enabled="== RSXS enabled. ==" rsxs_disabled="== RSXS disabled. ==" +fishbmc_enabled="== FishBMC enabled. ==" +fishbmc_disabled="== FishBMC disabled. ==" projectm_enabled="== ProjectM enabled. ==" projectm_disabled="== ProjectM disabled. ==" x11_enabled="== X11 enabled. ==" @@ -302,6 +304,12 @@ AC_ARG_ENABLE([rsxs], [use_rsxs=$enableval], [use_rsxs=yes]) +AC_ARG_ENABLE([fishbmc], + [AS_HELP_STRING([--enable-fishbmc], + [enable FishBMC visualisation (default is yes)])], + [use_fishbmc=$enableval], + [use_fishbmc=yes]) + AC_ARG_ENABLE([projectm], [AS_HELP_STRING([--enable-projectm], [enable ProjectM visualisation (default is yes)])], @@ -1255,6 +1263,16 @@ else fi fi +# FISHBMC +if test "$use_fishbmc" = "no" || test "$use_gl" = "no"; then + AC_MSG_NOTICE($fishbmc_disabled) + DISABLE_FISHBMC=1 + use_fishbmc="no" +else + AC_MSG_NOTICE($fishbmc_enabled) + DISABLE_FISHBMC=0 +fi + # PROJECTM if test "$use_projectm" = "no" || test "$use_gl" = "no"; then AC_MSG_NOTICE($projectm_disabled) @@ -2007,6 +2025,12 @@ else final_message="$final_message\n RSXS:\t\tNo" fi +if test "$use_fishbmc" = "yes"; then + final_message="$final_message\n FishBMC:\tYes" +else + final_message="$final_message\n FishBMC:\tNo" +fi + if test "$use_projectm" = "yes"; then final_message="$final_message\n ProjectM:\tYes" else @@ -2413,6 +2437,7 @@ AC_SUBST(SDL_DEFINES) AC_SUBST(BUILD_DVDCSS) AC_SUBST(DISABLE_GOOM) AC_SUBST(DISABLE_RSXS) +AC_SUBST(DISABLE_FISHBMC) AC_SUBST(DISABLE_PROJECTM) AC_SUBST(USE_SKIN_TOUCHED) AC_SUBST(USE_EXTERNAL_FFMPEG) |