Permalink
Browse files

configure: let select XBMCProjectM, this adds support to enable/disab…

…le building XBMCProjectM via configure option
  • Loading branch information...
1 parent 2b6a5d1 commit 71892845a840d3e9732e731dc38a1a399b018dfd @sraue sraue committed Sep 6, 2011
Showing with 46 additions and 25 deletions.
  1. +3 −4 Makefile.in
  2. +43 −21 configure.in
View
@@ -141,11 +141,10 @@ ifneq (@DISABLE_RSXS@,1)
endif
VIS_DIRS=xbmc/visualizations/OpenGLSpectrum \
- xbmc/visualizations/WaveForm
+ xbmc/visualizations/WaveForm
-ifeq (@USE_OPENGL@,1)
-VIS_DIRS+=\
- xbmc/visualizations/XBMCProjectM
+ifneq (@DISABLE_PROJECTM@,1)
+ VIS_DIRS+= xbmc/visualizations/XBMCProjectM
endif
ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1))
View
@@ -79,6 +79,8 @@ goom_enabled="== GOOM enabled. =="
goom_disabled="== GOOM disabled. =="
rsxs_enabled="== RSXS enabled. =="
rsxs_disabled="== RSXS disabled. =="
+projectm_enabled="== ProjectM enabled. =="
+projectm_disabled="== ProjectM disabled. =="
x11_enabled="== X11 enabled. =="
x11_disabled="== X11 disabled. =="
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
@@ -236,6 +238,12 @@ AC_ARG_ENABLE([rsxs],
[use_rsxs=$enableval],
[use_rsxs=yes])
+AC_ARG_ENABLE([projectm],
+ [AS_HELP_STRING([--enable-projectm],
+ [enable ProjectM visualisation (default is yes)])],
+ [use_projectm=$enableval],
+ [use_projectm=yes])
+
AC_ARG_ENABLE([x11],
[AS_HELP_STRING([--enable-x11],
[enable x11 (default is yes) 'Linux Only'])],
@@ -890,6 +898,15 @@ else
fi
fi
+# PROJECTM
+if test "$use_projectm" = "no" || test "$use_gl" = "no"; then
+ AC_MSG_NOTICE($projectm_disabled)
+ DISABLE_PROJECTM=1
+else
+ AC_MSG_NOTICE($projectm_enabled)
+ DISABLE_PROJECTM=0
+fi
+
# libRTMP
if test "$use_librtmp" != "no"; then
AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
@@ -1365,6 +1382,12 @@ else
final_message="$final_message\n RSXS:\t\tNo"
fi
+if test "$use_projectm" = "yes"; then
+ final_message="$final_message\n ProjectM:\t\tYes"
+else
+ final_message="$final_message\n ProjectM:\t\tNo"
+fi
+
if test "$use_x11" = "yes"; then
final_message="$final_message\n X11:\t\tYes"
else
@@ -1600,6 +1623,7 @@ AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(DISABLE_GOOM)
AC_SUBST(DISABLE_RSXS)
+AC_SUBST(DISABLE_PROJECTM)
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(PYTHON_VERSION)
AC_SUBST(OUTPUT_FILES)
@@ -1824,27 +1848,25 @@ XB_CONFIG_MODULE([lib/libid3tag/libid3tag],[
], [0])
XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
-if test "$use_gl" = "no"; then :; else
-set -x
- rm -f CMakeCache.txt && CC="$CC" CXX="$CXX" cmake \
- -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
- -DCMAKE_C_FLAGS:STRING="${CPPFLAGS} ${CFLAGS}" \
- -DCMAKE_CXX_FLAGS:STRING="${CPPFLAGS} ${CXXFLAGS}" \
- -DCMAKE_INSTALL_PREFIX="${prefix}" \
- -DCMAKE_INSTALL_LIBDIR:PATH="${libdir}" \
- -DINCLUDE_INSTALL_DIR:PATH="${includedir}" \
- -DLIB_INSTALL_DIR:PATH="${libdir}" \
- -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" \
- -DSHARE_INSTALL_PREFIX:PATH="${datadir}" . &&
- if test "$host_vendor" = "apple" ; then
- # cmake has hardcoded paths to macports which bork our darwin depends cross/ppc, remove them
- sed -i "" -e "s|-L/opt/local/lib| |" CMakeFiles/projectM.dir/link.txt
- sed -i "" -e "s|-L/opt/local/lib| |" CMakeFiles/projectM.dir/flags.make
- sed -i "" -e "s|-I/opt/local/include| |" CMakeFiles/projectM.dir/flags.make
- fi
-set +x
-fi
-], [0])
+ set -x
+ rm -f CMakeCache.txt && CC="$CC" CXX="$CXX" cmake \
+ -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
+ -DCMAKE_C_FLAGS:STRING="${CPPFLAGS} ${CFLAGS}" \
+ -DCMAKE_CXX_FLAGS:STRING="${CPPFLAGS} ${CXXFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX="${prefix}" \
+ -DCMAKE_INSTALL_LIBDIR:PATH="${libdir}" \
+ -DINCLUDE_INSTALL_DIR:PATH="${includedir}" \
+ -DLIB_INSTALL_DIR:PATH="${libdir}" \
+ -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" \
+ -DSHARE_INSTALL_PREFIX:PATH="${datadir}" . &&
+ if test "$host_vendor" = "apple" ; then
+ # cmake has hardcoded paths to macports which bork our darwin depends cross/ppc, remove them
+ sed -i "" -e "s|-L/opt/local/lib| |" CMakeFiles/projectM.dir/link.txt
+ sed -i "" -e "s|-L/opt/local/lib| |" CMakeFiles/projectM.dir/flags.make
+ sed -i "" -e "s|-I/opt/local/include| |" CMakeFiles/projectM.dir/flags.make
+ fi
+ set +x
+], [$DISABLE_PROJECTM])
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
./configure \

0 comments on commit 7189284

Please sign in to comment.